252167 Commits

Author SHA1 Message Date
Sergio Giro
52e0434748 Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am: 6767fd28b1

Change-Id: Ib80d6ae24734def58881a4536b232870fb885015
2016-09-07 12:21:17 +00:00
Sergio Giro
09a2121d5d Merge "java.security.SecureRandom: add getInstanceStrong() method"
am: 4c2df18a4d

Change-Id: I5faf9c49a7d09e8eef38edd6cf32de4f65783e5d
2016-09-07 12:20:49 +00:00
Sergio Giro
290f2bb2a0 Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
am: 59c0fcf0c8

Change-Id: I8fd7dc636a579c67c4b9851f4babae30e19a2024
2016-09-07 12:14:47 +00:00
Sergio Giro
6767fd28b1 Merge "java.security.PKCS12Attribute: port class from jdk8u60" 2016-09-07 12:07:13 +00:00
Sergio Giro
4c2df18a4d Merge "java.security.SecureRandom: add getInstanceStrong() method" 2016-09-07 12:05:35 +00:00
Sergio Giro
59c0fcf0c8 Merge "java.security: port DomainLoadStoreParameter from jdk8u60" 2016-09-07 12:04:21 +00:00
Yohann Roussel
166ab31073 Merge "Add a test app for suppressed exceptions"
am: 15c6078f4d

Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba
2016-09-07 10:03:08 +00:00
Yohann Roussel
15c6078f4d Merge "Add a test app for suppressed exceptions" 2016-09-07 09:52:50 +00:00
Etan Cohen
20d6e886a7 Merge changes from topic 'enable_nan'
am: 62419a0138

Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216
2016-09-07 04:33:23 +00:00
Lorenzo Colitti
8b8bef622a Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
am: 4171cdf303  -s ours

Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198
2016-09-07 04:28:21 +00:00
Etan Cohen
e3efe944fd [NAN] Add transport type for NAN. [DO NOT MERGE]
am: bd9fdbe022  -s ours

Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7
2016-09-07 04:27:28 +00:00
Etan Cohen
62419a0138 Merge changes from topic 'enable_nan'
* changes:
  Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
  [NAN] Add transport type for NAN. [DO NOT MERGE]
2016-09-07 04:19:52 +00:00
Roshan Pius
e597198f12 Merge "WifiConfiguration: Fix isEnterprise"
am: 9221c96ae0

Change-Id: I439205f4db4bfc292f084ea716014d64353c2885
2016-09-06 23:02:10 +00:00
Lorenzo Colitti
4171cdf303 Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
(cherry-pick of commit eab17da5882e59caff25c73aa6bcd0587aca9dd4)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-09-06 15:54:16 -07:00
Etan Cohen
bd9fdbe022 [NAN] Add transport type for NAN. [DO NOT MERGE]
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7b84987a6acf2f0a950c334a17a6ee085db3ba4f)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
2016-09-06 15:54:10 -07:00
Treehugger Robot
9221c96ae0 Merge "WifiConfiguration: Fix isEnterprise" 2016-09-06 22:51:43 +00:00
Mathieu Chartier
7554be1e36 Merge "Avoid profile guided compilation for vmSafeMode"
am: a817838e8b

Change-Id: I5e761bb08c72ed2700cec752caba5a6b02b02015
2016-09-06 22:30:34 +00:00
Mathieu Chartier
a817838e8b Merge "Avoid profile guided compilation for vmSafeMode" 2016-09-06 22:19:03 +00:00
yuanhuihui
130cb9232a Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"
am: 1cd6248012

Change-Id: Ie1d930f8925431641932bf1c4c94df9e57ffefc5
2016-09-06 21:15:46 +00:00
Andreas Gampe
0bb64f1b3e Merge changes from topic 'cherry_pms_installd'
am: 421c74f8e7

Change-Id: Ie69459a637f38cb1d9cf51f9069851fb75232264
2016-09-06 21:15:42 +00:00
Todd Kennedy
2ee7053cfc Release mPackages lock earlier
am: 94f9be2ee2

Change-Id: I461f9588d34413705ee54d410b0d55936b699a04
2016-09-06 21:15:40 +00:00
Andreas Gampe
6c22810fb3 OtaDexopt: Special-case system app classpaths
am: 3f95d0bb6a

Change-Id: Ia12705715f2638c0733192cd3324fbc05bd5d420
2016-09-06 21:15:34 +00:00
Andreas Gampe
4775ba500c OtaDexoptService: Run dexopt on all apps
am: 14186731f9

Change-Id: I6f53fc0acaa8f5413ac70488e4bd9938a3253cbf
2016-09-06 21:15:29 +00:00
Andreas Gampe
723bbd880a Frameworks/base: Add compiler stats to Package Manager
am: 7e619a912c

Change-Id: I4784db13f78d130c75277ece8313e1e638c11698
2016-09-06 21:15:23 +00:00
Calin Juravle
788e111cba [RFC] Special case system apps for profile optimizations
am: 08313b0d95

Change-Id: I4a44215cf5f9b7bcb3bcf131c7404fbb407d00d1
2016-09-06 21:15:17 +00:00
Calin Juravle
54a3247073 Compile core-apps according to their own "reason" for A/B
am: 9438528d99

Change-Id: Iba85d525810252b34bc862017b9ffe578f27fc93
2016-09-06 21:15:09 +00:00
Andreas Gampe
32a092adf3 Frameworks/base: Add new flow to OtaDexoptService
am: d15300cf38

Change-Id: I74f9938dc74c19ee0ef220ab3b50daa1085edea2
2016-09-06 21:15:01 +00:00
Andreas Gampe
630a372a1d Otadexopt: Expose progress percentage
am: ff8ab4c9fa

Change-Id: I2c7e91842d0975505c6b2e701c087b598d08e6cc
2016-09-06 21:14:53 +00:00
Alex Light
0b89b352d4 cp preopted files from B partition during PM init.
am: 2b6fc4c92d

Change-Id: I97015c4a43d08d4420a745b09875eee467b85a1f
2016-09-06 21:14:43 +00:00
Treehugger Robot
1cd6248012 Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" 2016-09-06 21:09:06 +00:00
Andreas Gampe
421c74f8e7 Merge changes from topic 'cherry_pms_installd'
* changes:
  Release mPackages lock earlier
  OtaDexopt: Special-case system app classpaths
  OtaDexoptService: Run dexopt on all apps
  Frameworks/base: Add compiler stats to Package Manager
  [RFC] Special case system apps for profile optimizations
  Compile core-apps according to their own "reason" for A/B
  Frameworks/base: Add new flow to OtaDexoptService
  Otadexopt: Expose progress percentage
  cp preopted files from B partition during PM init.
2016-09-06 21:02:55 +00:00
Todd Kennedy
94f9be2ee2 Release mPackages lock earlier
We cannot hold mPackages when calling into generatePackageDexopts().
This method takes Package Manager's mInstallLock. By holding mPackages,
we have lock inversion and hilarity ensues.

Change-Id: Ia11a158677051e3511702f38cde6780e75b256fb
Fixes: 30927731
(cherry picked from commit a8d4f489974f3ea8f73990cbabbce205343fb926)
2016-09-06 10:46:18 -07:00
Andreas Gampe
3f95d0bb6a OtaDexopt: Special-case system app classpaths
Specialize system apps' shared libraries so that classpath checks
are elided.

Bug: 30568568
Change-Id: Id1f2555ef43984b616e01f8596701ccba77895b3
(cherry picked from commit c7e02c1d2a53e0f738d2a8383e03658b39d91ce6)
2016-09-06 10:45:06 -07:00
Andreas Gampe
14186731f9 OtaDexoptService: Run dexopt on all apps
To avoid work after reboot, dexopt all apps. However, unimportant
apps are optimized with the first-boot reason (which is usually
interpret-only) for space reasons.

Bug: 30468718
Change-Id: Ia05d879957388967c69f9380e50d8a9834afe07d
(cherry picked from commit 115514b236ebe7cb3c90892891954b8c7ba69335)
2016-09-06 10:44:00 -07:00
Andreas Gampe
7e619a912c Frameworks/base: Add compiler stats to Package Manager
Add a simple class for storing compiler statistics. Capture compile
times for code paths from a package.

Bug: 29223204
Change-Id: I1b066de6a83a739470a42480eee0bfef88423eea
(cherry picked from commit 37e5fdc6b4963f3533caecdd92b129f79da69dd8)
2016-09-06 10:41:59 -07:00
Calin Juravle
08313b0d95 [RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.

Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).

Bug: 30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"

Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
(cherry picked from commit 0bd776207999ccba17e5adb163710bd7b16ac907)
2016-09-06 10:41:04 -07:00
Calin Juravle
9438528d99 Compile core-apps according to their own "reason" for A/B
If the core apps are not preopted in the B OTA, and REASON_AB_OTA is not
speed (by default is speed-profile) they will be interepreted/JITed.
This in itself is not a problem as we will end up doing profile guided
compilation. However, some core apps may be loaded by system server
which doesn't JIT and we need to make sure we don't interpret-only.

Bug: 30032273
Change-Id: Idb11b1c01c4c4ceba043feb3a9ccc6958035d3b7
(cherry picked from commit 565621328dd4fc2e179a34494d0f8b8dc1b1eae9)
2016-09-06 10:40:18 -07:00
Andreas Gampe
d15300cf38 Frameworks/base: Add new flow to OtaDexoptService
Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.

Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.

In preparation for renaming of A/B OTA artifacts to include target
slot names.

Bug: 25612095
Bug: 28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb
(cherry picked from commit cc241a580cb9b753d0dde0cea578feb74ad517e7)
2016-09-06 10:39:56 -07:00
Andreas Gampe
ff8ab4c9fa Otadexopt: Expose progress percentage
To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.

Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
(cherry picked from commit bf06232f4d440ced8230662a77ca0e8ece6383ca)
2016-09-06 10:39:20 -07:00
Roshan Pius
29ce1dab5a WifiConfiguration: Fix isEnterprise
Add a check for the eap method in Enterpriseconfig associated with the
WifiConfiguration.

BUG: 31275240
Change-Id: I21aabb09bdd21e29a80d4b9c6ea0e2b1f0d7e2df
2016-09-06 10:13:40 -07:00
Alex Light
2b6fc4c92d cp preopted files from B partition during PM init.
This allows us to save space on the system partition while still
having access to the preopted files.

We do this on first boot when the "ro.cp_system_other_odex" property
is set to 1. We do this during package manager initialization before
scanning the system to see which apks need to be optimized again.

Note that a separate script, run by init, is actually responsible for
finding and copying the files. We simply request that it runs.

Bug: 29278988

Change-Id: I8d7c790ad35b32a0ce1d87939f043419bae4d88a
(cherry picked from commit 3dafee6c1820bf0946bab04b290c5a757112d3e7)
2016-09-06 08:53:00 -07:00
yuanhuihui
efd1f1242b fixes mStartedUsers shoule be locked by mLock, not mVolumes
when create/delete multiple user, plug/unplug externel storage(such as sdcard) at the same time.
multiple threads run concurrency , the newly created user can not get state of externel storage.

https://code.google.com/p/android/issues/detail?id=215901

Change-Id: I097f5291108af89a430e12045376065d71d48175
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
2016-09-05 13:54:00 +08:00
Yang Ni
e80df238c0 Merge "Updated user document for Single-Source RenderScript"
am: f7c508ae09

Change-Id: Icd465aaf7bbd534f61863714b726d3afafaebd3f
2016-09-03 06:33:10 +00:00
Treehugger Robot
f7c508ae09 Merge "Updated user document for Single-Source RenderScript" 2016-09-03 06:22:38 +00:00
Mathieu Chartier
41e4a376f1 Avoid profile guided compilation for vmSafeMode
Bug: 30688277
Bug: 30733908

Test: adb shell cmd package compile -m speed-profile comb.BBClient

Change-Id: I6783c80566b6b3b67025a3d258ebbdede0c7ca2d
2016-09-02 18:15:45 -07:00
Yang Ni
60617373a5 Updated user document for Single-Source RenderScript
Bug: 29875503
Bug: 29879448

Added a section introducing the new single-source feature.

Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html

This updates
https://developer.android.com/guide/topics/renderscript/compute.html

Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
(cherry picked from commit c069ed7f8c3d307c9fed2c8d1a81e28152190b5a)
2016-09-02 17:25:49 -07:00
Roshan Pius
8abe7c5544 Merge "WifiEnterpriseConfig: Fix copy constructor"
am: 13886253be

Change-Id: I473df0031cd8d1cb3ddf24e3d89c621a7df7f02a
2016-09-02 21:16:27 +00:00
Roshan Pius
13886253be Merge "WifiEnterpriseConfig: Fix copy constructor" 2016-09-02 21:10:10 +00:00
Roshan Pius
9709b8b372 WifiEnterpriseConfig: Fix copy constructor
Add missing elements from WifiEnterpriseConfig copy
constructor.

BUG: 31245222
TEST: Ran ACTS WifiEnterpriseTest suite.
Change-Id: Ia6f95fca4131ad9a1facca8f9c4c856dff868058
2016-09-02 14:08:50 -07:00
Iliyan Malchev
4ce1c58b12 Merge changes from topic 'java_hidl_support'
am: 6902285a44

Change-Id: Ifd0820a0caaa9d853feb8632d78132aec32b32a4
2016-09-02 20:22:48 +00:00