LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,957 Commits 2 Branches 0 Tags
cda4e1baac4e944ab91dedfeab87007543fd0c5a
Commit Graph

19957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergio Giro
cda4e1baac Merge \"KeyDerivationFunction: example about treating data encrypted via SHA1PRNG\" into nyc-dev 
am: 11716729a7

Change-Id: I16ee07b32f7ccca8470fc938ad2b2f6442e7bcfe
 2016-06-08 14:44:37 +00:00
Sergio Giro
11716729a7 Merge "KeyDerivationFunction: example about treating data encrypted via SHA1PRNG" into nyc-dev 2016-06-08 14:31:38 +00:00
Sergio Giro
952349c6b9 KeyDerivationFunction: example about treating data encrypted via SHA1PRNG 
The Crypto provider providing the SHA1PRNG algorithm for random number
generation was deprecated.

This algorithm was sometimes incorrectly used to derive keys.

This example provides a helper class and shows how to treat data that
was encrypted in the incorrect way and re-encrypt it in a proper way.

(cherry picked from commit 477c90ca1a)

Bug: 27873296
Change-Id: I180d76c4aa7fb9aa8c332119bf094e050a63b58c
 2016-06-08 14:56:37 +01:00
Joshua Lang
85b415e1e8 Add arm ranchu kernels to system packages 
am: 48e6404e40

* commit '48e6404e402820e5468de299a6833c17ee30e057':
  Add arm ranchu kernels to system packages

Change-Id: I7cba5890d88f756ca9bc2ea29d84f8b13b4074b0
 2016-06-07 01:10:43 +00:00
Joshua Lang
48e6404e40 Add arm ranchu kernels to system packages 
bug: 28911268
Change-Id: I0fea8b4ef11ec6f55a190ed95f9d6a757ac757a5
(cherry picked from commit e5ab3249709214d06eb1660b67f8db6d7162bf15)
(cherry picked from commit 936ec1b9016c71c2d3feb689e38fe11018da26a1)
 2016-06-06 17:13:29 +00:00
TreeHugger Robot
aa2219d07b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-04 03:05:20 +00:00
Bill Yi
dc45195c06 Import translations. DO NOT MERGE 
Change-Id: I1fce0fb935f5e590f5a640e85af0d9a07288801a
Auto-generated-cl: translation import
 2016-06-03 16:18:00 -07:00
Andrii Kulian
753b1b92a7 Fix new task starting in samples 
am: e5d940bda0

* commit 'e5d940bda03932c9218281c66c606dc94734b9be':
  Fix new task starting in samples

Change-Id: I0fa121818fed34895de7a4c97a6ced5e095c961d
 2016-06-03 02:06:23 +00:00
Andrii Kulian
e5d940bda0 Fix new task starting in samples 
Added correct intent action and category. Added separate case to
show the behavior with and without FLAG_ACTIVITY_MULTIPLE_TASK.

Bug: 28848683
Change-Id: I4ba3908b7331e6d4c5f2d78c0a861e00487fcae4
 2016-06-02 11:56:37 -07:00
Makoto Onuki
ec1232bdbb Merge "ShortcutDemo: Address API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Dianne Hackborn
66c8ee24d5 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 
am: e3d3154c1a

* commit 'e3d3154c1ad7cfd2543bb839623646b942714908':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I1d0eca577f6aaa81f456737e432eae6c38b0b196
 2016-06-01 19:37:49 +00:00
Dianne Hackborn
e3d3154c1a Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 2016-06-01 19:29:42 +00:00
Makoto Onuki
b8dc9f912b ShortcutDemo: Address API rename 
Bug 29057378

Change-Id: Iddcdb0d0418e19661cbadb4a6ff8788e8d2dfb0c
 2016-06-01 10:09:41 -07:00
Dianne Hackborn
1f502540b7 Fix issue #29058724: Improve JobScheduler API demo 
Change-Id: I551d4d3376e522ee2d790331e8f83711450c9d19
 2016-05-31 18:03:28 -07:00
Christopher Ferris
26845d0491 Fix how the script gets data from apks. 
am: d50f287b81

* commit 'd50f287b81011f6a6cb9091a0a9c75f6bbc19966':
  Fix how the script gets data from apks.

Change-Id: Ia7eb63366580136ccebedaf4b5f391b848af43b2
 2016-05-31 23:11:02 +00:00
Christopher Ferris
d50f287b81 Fix how the script gets data from apks. 
The previous code used unzip to get the offsets of the files in
the zip file. This was an estimate, and it turns out to be wrong
in many cases. Replace that with zipinfo -v which gives the exact
offset of the files in the zip.

Also update the tmp files so that they are in a dictionary of their
own by apk, instead of embedded in the offset list.

Bug: 29050779

(cherry picked from commit abe22f4616)

Change-Id: I4e33704c5b26cd238ff7e316bca9de729480c59c
 2016-05-31 13:21:55 -07:00
Makoto Onuki
f3ee57a5e1 Shortcut demo: Use the new get shortcut drawable API 
Bug 28594168

Change-Id: I0efe5a2f129edec43524316022fed435d815f341
 2016-05-27 10:46:10 -07:00
Makoto Onuki
793950a273 Merge "ShortcutManager demo: Manifest shortcuts + API renames" into nyc-mr1-dev 2016-05-27 17:21:53 +00:00
Lingfeng Yang
612849ace6 Turn on GrallocSync feature. 
am: 6d99fa2661

* commit '6d99fa2661637d43f9e42a95fcab135c98727fc9':
  Turn on GrallocSync feature.

Change-Id: I472dd716a1c460a06cb466c91339b19510f0c767
 2016-05-27 16:48:18 +00:00
Lingfeng Yang
6d99fa2661 Turn on GrallocSync feature. 
Needed for webcam frames to be in order.

bug:28406160

Change-Id: Iffd43af1e0ece36fe3f4f509cde7e766fd692a16
(cherry picked from commit 381fd6a90cb3b3bc2937ff97b9434f49c464a933)
 2016-05-27 16:35:55 +00:00
Yahan Zhou
3f64f62064 Feature control config file in system image 
am: 9fd4870d14

* commit '9fd4870d1481d6e1ecdefb8ea3706a2d422fc5c2':
  Feature control config file in system image

Change-Id: I0ec81f681eb485c6623fd6c866bf6b0287c38f35
 2016-05-27 04:14:24 +00:00
Yahan Zhou
9fd4870d14 Feature control config file in system image 
This CL adds feature control config file to the system image bundle.

It works with this emulator CL:

https://android-review.googlesource.com/#/c/233279/

Change-Id: I1e0f73f0dc36853d99c2408679aa6706b6489a58
(cherry picked from commit 280091d47054677b358216c8fa0cac106d42a520)
 2016-05-27 01:52:24 +00:00
Michael Wright
b11ac33af7 Merge "DO NOT MERGE Remove Pointer Capture API." into nyc-dev 
am: d48a67a190

* commit 'd48a67a190f785b5f5d1b41a5a8823592730deb7':
  DO NOT MERGE Remove Pointer Capture API.

Change-Id: Ibb2d8315d3d2bf2eeee1f4ea7a54e6aac022cb8e
 2016-05-26 14:25:57 +00:00
Michael Wright
d48a67a190 Merge "DO NOT MERGE Remove Pointer Capture API." into nyc-dev 2016-05-26 13:40:24 +00:00
Xavier Ducrohet
e92a523cfe Final API 24 SDK for N. 
am: dfbd2eecf2

* commit 'dfbd2eecf2a50bb53bb5990ff26fb6b4837a9e68':
  Final API 24 SDK for N.

Change-Id: If108e75fb287b23545b49386b689c6306d4dfa0a
 2016-05-26 04:14:15 +00:00
Xavier Ducrohet
dfbd2eecf2 Final API 24 SDK for N. 
Change-Id: Ifd8643ecc2a6787d123e9336be6d75976fb72935
 2016-05-25 17:42:59 -07:00
Sebastien Hertz
c016eb3074 Add jack-jacoco-plugin.jar to build tools 
am: 882fd85a9b

* commit '882fd85a9bcac712e49960313b8b255b6c352123':
  Add jack-jacoco-plugin.jar to build tools

Change-Id: Id014f5f002f9cc498ee3b79ecf843112f94c7b33
 2016-05-25 15:48:19 +00:00
Sebastien Hertz
882fd85a9b Add jack-jacoco-plugin.jar to build tools 
Bug: 28945296

(cherry picked from commit fa52ee31da)

Change-Id: I02692a8f6495c280005130704c46f4620f1fd3e2
 2016-05-25 16:20:19 +02:00
Makoto Onuki
a02d7acf66 ShortcutManager demo: Manifest shortcuts + API renames 
Bug 28785283
Bug 28536066

Change-Id: I5b12715038a30a143f2df7ccc188ea23e88605f9
 2016-05-24 17:53:49 -07:00
bohu
bd02f713c2 emulator: bump revision of sdk system images to 4 
am: fbaf0884db

* commit 'fbaf0884db55e515c918657bc45d4f0c127b7ac5':
  emulator: bump revision of sdk system images to 4

Change-Id: I75fc621187a861533afc00f243433123776f3db5
 2016-05-25 00:26:57 +00:00
bohu
fbaf0884db emulator: bump revision of sdk system images to 4 
bug: 28939839

Change-Id: Ia45060bc1e81c1ab432bc27a25768ad4409dec55
 2016-05-24 16:33:17 -07:00
Evan Birenbaum
7e6f9f32ce Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev 
am: 738f9df0c8

* commit '738f9df0c8e42b396a4e54a886e94fc647681f27':
  Fix a crash when exiting the DevTools Connectivity page.

Change-Id: I0a31fa64d2d5d1a6a21bcb1fad81518d03d61517
 2016-05-24 20:52:00 +00:00
Chris Iremonger
738f9df0c8 Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev 2016-05-24 20:40:11 +00:00
Evan Birenbaum
2817836d75 Fix a crash when exiting the DevTools Connectivity page. 
A lock was being released without checking if it was held, which
resulted in a crash because WifiManager.MulticastLock is reference
counted by default.

BUG=28668604

Change-Id: I306731129894d5525e974561c2680ae7db5aff4b
 2016-05-24 03:36:25 +00:00
Xavier Ducrohet
95c74ecf9a Merge "Move SDK platfrom component to rev 4" into nyc-dev 
am: 99433f6878

* commit '99433f687836b98aaf411478c728bd8c4a2c8e32':
  Move SDK platfrom component to rev 4

Change-Id: If285ed18ddfd11d93bedc988541110d8a65a8a9b
 2016-05-24 00:38:15 +00:00
Xavier Ducrohet
99433f6878 Merge "Move SDK platfrom component to rev 4" into nyc-dev 2016-05-24 00:22:53 +00:00
Xavier Ducrohet
66ffdc5759 Move SDK platfrom component to rev 4 
Bug: 28913561

Change-Id: I272147e029aa771c3deea55d7702a4c039168eb8
 2016-05-24 00:22:26 +00:00
Miao Wang
ba0533ca66 Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev 
am: afdc158c77

* commit 'afdc158c772bf7d45b1e405a7fad39d6c3518d95':
  [RenderScript] Move BLAS libs to a separate blas/ dir.

Change-Id: I271168de96719dc303ea7c27514eb957d301ea44
 2016-05-24 00:01:54 +00:00
Miao Wang
74c770d46a Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev 
am: 5f0e3ac209

* commit '5f0e3ac209b2e3600476c7515ef74a575d13d4ef':
  Add x86_64 linker to Build-Tools for RenderScript.

Change-Id: Ia8947c87c023483b7dd78cd4b5fb8dcddbcc4cb8
 2016-05-24 00:01:53 +00:00
Miao Wang
3c3bc89a7c Merge "Add x86_64 RenderScript prebuilts to Build-Tools." into nyc-dev 
am: 0b79118f35

* commit '0b79118f35d0cc4464cd55605c101d37825840e0':
  Add x86_64 RenderScript prebuilts to Build-Tools.

Change-Id: Ieb475fe80dbac07cd1b16286afde6251a28d4317
 2016-05-24 00:01:47 +00:00
Miao Wang
afdc158c77 Merge "[RenderScript] Move BLAS libs to a separate blas/ dir." into nyc-dev 2016-05-23 23:45:11 +00:00
Miao Wang
5f0e3ac209 Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev 2016-05-23 23:44:26 +00:00
Miao Wang
0b79118f35 Merge "Add x86_64 RenderScript prebuilts to Build-Tools." into nyc-dev 2016-05-23 23:44:26 +00:00
Miao Wang
f8efab30e6 [RenderScript] Move BLAS libs to a separate blas/ dir. 
Bug: 28861779

  - Move support lib BLAS to renderscript/lib/blas/.
  - Make it a optional component for the APK.

Change-Id: Id5937745642a268ae73a5a23c75657b0231626c6
 2016-05-23 14:22:18 -07:00
Miao Wang
7516c05b76 Add x86_64 RenderScript prebuilts to Build-Tools. 
Bug: 27972043

Change-Id: Iefcb0f63e72cea0b58b21fc7b9fef8c6e7e8b70d
 2016-05-23 14:14:27 -07:00
Alan Viverette
dccbe07343 Merge "Add documents-archive to list of support libraries" into nyc-dev 
am: 1a44969bce

* commit '1a44969bce4e65524feb4b4ba2679f20c8b6a398':
  Add documents-archive to list of support libraries

Change-Id: Iee5d318771eb9aa3cc2a5a4bbbeedcf91fbf0db8
 2016-05-19 19:48:44 +00:00
Alan Viverette
1a44969bce Merge "Add documents-archive to list of support libraries" into nyc-dev 2016-05-19 19:39:11 +00:00
Andrii Kulian
76895e8aed Merge "Improve MultiWindow sample" into nyc-dev 
am: 13ab0f50b1

* commit '13ab0f50b145baf3605cfd50fd93fddc1d0b25db':
  Improve MultiWindow sample

Change-Id: Ie762ec28b81051a9549f2034f0ff39506656da17
 2016-05-19 17:28:06 +00:00
Andrii Kulian
13ab0f50b1 Merge "Improve MultiWindow sample" into nyc-dev 2016-05-19 17:13:21 +00:00
Michael Wright
ddd647da37 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: e575990583

* commit 'e575990583183fc804e1ff41e91dea8c7dd5decc':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Ib7f4001f3f78af9036e7ceba9f7e49a094b32772
 2016-05-19 15:11:55 +00:00