OSDN Git Service
Calin Juravle [Thu, 2 Nov 2017 18:34:38 +0000 (18:34 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" am:
1ad0304e7d
am:
1c6eeaec1b -s ours
Change-Id: I506470013e57b288d54eb5bc308eb79c7c224e69
Calin Juravle [Thu, 2 Nov 2017 18:24:12 +0000 (18:24 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"
am:
1ad0304e7d
Change-Id: I32a9c3cf57d0726d7959eb331530fab7f79a7619
Treehugger Robot [Thu, 2 Nov 2017 18:10:42 +0000 (18:10 +0000)]
Merge "Ensure dexopt is executed only with consistent package data"
Calin Juravle [Fri, 11 Aug 2017 00:23:00 +0000 (17:23 -0700)]
Ensure dexopt is executed only with consistent package data
The main objects bookkeeping packages (PackageParser.Package and its
corresponding ApplicationInfo) may be updated at different times. This
creates a window where the data stored in the ApplicationInfo is out of
date with respect to the data stored in PackageParser.Package.
During install, the two objects are "synced" during doRename which updates
the package code paths.
This CLs moves the dexopt invocation from the install flow after doRename
to ensure that dexopt logic gets a consistent view of the package.
(cherry picked from commit
4c2b9555b7b52359ea14e201d7ec61b8edaf6232)
Bug:
64493351
Test: run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m
CtsAppSecurityHostTestCases
inspect oat files after
adb install-multiple CtsClassloaderSplitApp/CtsClassloaderSplitApp.apk
CtsClassloaderSplitAppFeatureA/CtsClassloaderSplitAppFeatureA.apk
CtsClassloaderSplitAppFeatureB/CtsClassloaderSplitAppFeatureB.apk
Merged-In: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Change-Id: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Charles He [Thu, 2 Nov 2017 10:58:30 +0000 (10:58 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()." am:
dfe472ecae
am:
c214d506d4
Change-Id: I0760ba5c839af8a9dd4b9161dbbad16eacdb3550
Charles He [Thu, 2 Nov 2017 10:47:31 +0000 (10:47 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."
am:
dfe472ecae
Change-Id: Ic0ea2afd4dfc00234b97a66a9dafd993b35dd803
Charles He [Thu, 2 Nov 2017 10:36:01 +0000 (10:36 +0000)]
Merge "TokenWatcher: fix bug in repeated calls to acquire()."
Sunny Goyal [Thu, 2 Nov 2017 04:46:07 +0000 (04:46 +0000)]
Preventing recursive referrence in drawables
am:
99b25d2817
Change-Id: I1c23d40e590d6d8bb21f6734a106d0ee217b6672
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
Yifan Hong [Thu, 2 Nov 2017 04:01:07 +0000 (04:01 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies." am:
762f27c6a2
am:
0134fd1577
Change-Id: I9b7b2b45967506469309353eb09c49738805b213
Andreas Gampe [Thu, 2 Nov 2017 03:51:58 +0000 (03:51 +0000)]
Merge "Frameworks: Fix idle-background-job flag" am:
3a16db62ec
am:
83419c750f
Change-Id: I78676a68b624813870bd100577969dbbea66b635
Yifan Hong [Thu, 2 Nov 2017 03:51:08 +0000 (03:51 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."
am:
762f27c6a2
Change-Id: Ia6ebb45cd2e7778483df3c191b3f0d175588e3fc
Andreas Gampe [Thu, 2 Nov 2017 03:41:49 +0000 (03:41 +0000)]
Merge "Frameworks: Fix idle-background-job flag"
am:
3a16db62ec
Change-Id: Ibb9a6213ccc5f48c848228af3a9c2a73e8309133
Treehugger Robot [Thu, 2 Nov 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Allow equality checking and hash for HIDL interface proxies."
Treehugger Robot [Thu, 2 Nov 2017 03:31:30 +0000 (03:31 +0000)]
Merge "Frameworks: Fix idle-background-job flag"
Calin Juravle [Thu, 2 Nov 2017 03:23:37 +0000 (03:23 +0000)]
Merge "Fix dexopt dump" am:
7ef653733f
am:
f8ce6d5209 -s ours
Change-Id: I03624a8bec67a461978ea4ba904be863de8b1c4c
Pengquan Meng [Thu, 2 Nov 2017 03:06:22 +0000 (03:06 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId" am:
87a336846e
am:
44dc116739
Change-Id: I16df51378764d9d62abe8c87c242e5a3a6c3b8ba
Jordan Liu [Thu, 2 Nov 2017 02:59:59 +0000 (02:59 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID." am:
c173c93c1c
am:
7f25f6d720
Change-Id: Ic46a95c693bfbcfe6884b0cacdb49450b94dcc9a
Hall Liu [Thu, 2 Nov 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS" am:
f1167ced38
am:
cca2b5a246
Change-Id: I495d10d673d0ac194835446b5c4587bf26246d7e
Tobias Thierer [Thu, 2 Nov 2017 02:47:59 +0000 (02:47 +0000)]
Merge "make update-api" am:
07fe9042cf
am:
e33d0f594e
Change-Id: I32a054929b04211c36394db8029f6bf651209991
Calin Juravle [Thu, 2 Nov 2017 02:40:16 +0000 (02:40 +0000)]
Merge "Fix dexopt dump"
am:
7ef653733f
Change-Id: I2373f5f980866548444cb8b9731d79437da12c39
Andreas Gampe [Thu, 2 Nov 2017 02:34:06 +0000 (02:34 +0000)]
Merge "resolve merge conflicts of
20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 2 Nov 2017 02:29:50 +0000 (02:29 +0000)]
Merge "Fix dexopt dump"
Christine Franks [Thu, 2 Nov 2017 01:39:19 +0000 (01:39 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev
am:
58a10a7b12
Change-Id: I34bc01c71a0a28857d41668c3cae5dc36f56b0d3
Yifan Hong [Wed, 1 Nov 2017 00:32:15 +0000 (17:32 -0700)]
Allow equality checking and hash for HIDL interface proxies.
IFoo.Proxy.equals() -> HidlSupport.equals() ->
IHwInterface.asBinder().equals() -> HwRemoteBinder.equals().
IFoo.Stub.equals() -> default Object.equals()
Notice that IHwInterface.asBinder() returns mRemote(of type
HwRemoteBinder) for proxies and itself (of type HwBinder) for stubs.
If IFoo.Stub.asBinder() had not return "this", its equals()
should also be overridden.
Bug:
68727931
Test: hidl_test_java
Change-Id: I916983d7bc739747145e2ebb6830226310fd4980
Daniel Sandler [Thu, 2 Nov 2017 01:29:56 +0000 (01:29 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev
am:
c2496f917c
Change-Id: If90a63b7adcb61db0e5e33016adf04d8cd3721cf
Pengquan Meng [Thu, 2 Nov 2017 01:21:11 +0000 (01:21 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId"
am:
87a336846e
Change-Id: Id0de42b730ca4941e1436e959604a28296508b03
Bryce Lee [Thu, 2 Nov 2017 01:14:49 +0000 (01:14 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev
am:
0be61c662b
Change-Id: I8db0cda8ce289423b9f63d3dc1b2598e951e1e2d
Christine Franks [Thu, 2 Nov 2017 01:13:21 +0000 (01:13 +0000)]
Merge "Respect legacy color mode settings" into oc-mr1-dev
Pengquan Meng [Thu, 2 Nov 2017 01:11:29 +0000 (01:11 +0000)]
Merge "Fix getSimOperator to return mccmnc based on subId"
Daniel Sandler [Thu, 2 Nov 2017 00:52:55 +0000 (00:52 +0000)]
Merge "Allow dnd access for secondary users" into oc-mr1-dev
Bryce Lee [Thu, 2 Nov 2017 00:52:40 +0000 (00:52 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 00:40:48 +0000 (17:40 -0700)]
Fix dexopt dump
Dexopt dump prints the status of primary oat file instead of secondary.
We cannot get the secondary dex file status without an installd call so
this CL just removes the status line.
(cherry picked from commit
cf72222f41f4ce73302274d2e8b4fcc735c3bd00)
Bug:
65843255
Test: adb shell dumpsys package dexopt
Merged-In: I76028704267eed68ba8c51f45ce8b54f403cc255
Change-Id: I76028704267eed68ba8c51f45ce8b54f403cc255
Andreas Gampe [Thu, 2 Nov 2017 00:05:53 +0000 (17:05 -0700)]
Frameworks: Fix idle-background-job flag
Correctly pass flag to installd.
Bug:
68025088
Test: m
Test: manual test
Change-Id: Ia5b19b1f1375a3c8b0c8e19b1978dcba29c83470
Andreas Gampe [Wed, 1 Nov 2017 23:56:39 +0000 (16:56 -0700)]
resolve merge conflicts of
20d9ae562062 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I73cd9a9198ef5640a6b3dced713fcbb17563dd8b
Jordan Liu [Wed, 1 Nov 2017 23:29:01 +0000 (23:29 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID."
am:
c173c93c1c
Change-Id: Ib9851f91a687fb56ba2488710fa3a580cd3f1e91
Jordan Liu [Wed, 1 Nov 2017 23:20:39 +0000 (23:20 +0000)]
Merge "Added interface to get the decimal digit from hex ICCID."
Hall Liu [Wed, 1 Nov 2017 23:17:05 +0000 (23:17 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS"
am:
f1167ced38
Change-Id: If22e7de55c8ec2f603c4a59f575b65cebf421a93
Tobias Thierer [Wed, 1 Nov 2017 23:01:37 +0000 (23:01 +0000)]
Merge "make update-api"
am:
07fe9042cf
Change-Id: I2562b319cb5d326a6067e20cc6b925c89366e07d
Calin Juravle [Wed, 1 Nov 2017 22:47:44 +0000 (22:47 +0000)]
Merge changes Ibf9e7b9e,I8031590c am:
1eb700a545
am:
f11984f9da -s ours
Change-Id: Ie7b5b381babaa15f07a73a6b647f7d92e722ca77
David Sehr [Wed, 1 Nov 2017 22:42:50 +0000 (22:42 +0000)]
Merge changes from topic "bgdex2oatd_cherry_pick"
am:
e686fabf42
Change-Id: Ib3aa6d92d2a4c5ef0617a57adea62913041d4b75
Calin Juravle [Wed, 1 Nov 2017 22:38:31 +0000 (22:38 +0000)]
Merge changes Ie8b78c7c,If02081d2 am:
fe177b78d7
am:
a47c4440fd -s ours
Change-Id: If37dbec17b0aa7e2443f9547eff63a6740d6fb75
Hall Liu [Wed, 1 Nov 2017 22:35:51 +0000 (22:35 +0000)]
Merge "Add @TestApi for EMBMS APIs needed for CTS"
Calin Juravle [Wed, 1 Nov 2017 22:35:16 +0000 (22:35 +0000)]
Merge changes Ibf9e7b9e,I8031590c
am:
1eb700a545
Change-Id: I3bff20ab08a33f1607ec7b91abab2a77d7a3b22f
Calin Juravle [Wed, 1 Nov 2017 22:29:53 +0000 (22:29 +0000)]
Merge changes I7bd99fc0,I329bc929 am:
deee2e12de
am:
71ae6b3aab -s ours
Change-Id: Ia35c56d89cc56f315418da14ab0b19f2839a972e
Calin Juravle [Wed, 1 Nov 2017 22:27:29 +0000 (22:27 +0000)]
Merge changes Ie8b78c7c,If02081d2
am:
fe177b78d7
Change-Id: I2720d1e1433367e9f584451408951dce0b61e0da
Calin Juravle [Wed, 1 Nov 2017 22:20:06 +0000 (22:20 +0000)]
Merge changes I7bd99fc0,I329bc929
am:
deee2e12de
Change-Id: I52905bf3d6971332b216c8b5f18a695a4bbd23c5
Treehugger Robot [Wed, 1 Nov 2017 22:18:39 +0000 (22:18 +0000)]
Merge "make update-api"
Treehugger Robot [Wed, 1 Nov 2017 21:55:02 +0000 (21:55 +0000)]
Merge changes from topic "bgdex2oatd_cherry_pick"
* changes:
Use dex2oatd when available on debug builds
Add package use info to dexopt dump
Treehugger Robot [Wed, 1 Nov 2017 21:53:50 +0000 (21:53 +0000)]
Merge changes Ibf9e7b9e,I8031590c
* changes:
Record usage information per split
Use PackageUseInfo in DexOptimizer
Treehugger Robot [Wed, 1 Nov 2017 21:53:12 +0000 (21:53 +0000)]
Merge changes Ie8b78c7c,If02081d2
* changes:
Use the class loader context when optimizing secondary dex files
Add DexClassLoader to the list of supported class loaders
Treehugger Robot [Wed, 1 Nov 2017 21:52:34 +0000 (21:52 +0000)]
Merge changes I7bd99fc0,I329bc929
* changes:
Save PackageDexUsage on PMS shutdown
Record dex files users in the dex-usage list
Calin Juravle [Wed, 1 Nov 2017 21:13:56 +0000 (21:13 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded" am:
945b1dc43e
am:
8952f058ff
Change-Id: Iad6377ad17a93948ae41b23d7f49669577869669
Jordan Liu [Wed, 1 Nov 2017 21:03:35 +0000 (21:03 +0000)]
Merge "Display the number of LTE signal bars is based on RSRP only" am:
896dd7cdb7
am:
973005e208
Change-Id: I5da4891c575f92e1703ddbe445b3f662e18c6ca9
Narayan Kamath [Wed, 1 Nov 2017 20:56:50 +0000 (20:56 +0000)]
Merge "Debug: Remove obsolete InstructionCount code." am:
f5a8edeaf0
am:
47659c3351
Change-Id: I1d4b929ead3af4ef3f9d28de2a3e905d124e718c
Narayan Kamath [Wed, 1 Nov 2017 20:51:37 +0000 (20:51 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" am:
dc616ab11c
am:
cfb01b3f3f
Change-Id: I69346b88c5ae62d4e520de25334fe9056a817994
Alan Viverette [Wed, 1 Nov 2017 20:44:31 +0000 (20:44 +0000)]
Merge "Federate platform docs against support library API file" into stage-aosp-master
am:
4ede13e1f5 -s ours
Change-Id: Id389db628eb0eb307e6401323b41612e4f89b1de
Calin Juravle [Wed, 1 Nov 2017 20:15:44 +0000 (20:15 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded"
am:
945b1dc43e
Change-Id: Ib9865f950f595ab840ceb3afd60ad52d33cb5c01
David Sehr [Wed, 25 Oct 2017 21:28:29 +0000 (14:28 -0700)]
Use dex2oatd when available on debug builds
Enable use of dex2oatd for background dexopt service for eng and
userdebug builds. This allows us to have more extensive checking
on dogfood devices.
(cherry picked from commit
2118ec4d7e176b0ea96a79ca3b45e1cca9724eed)
Bug:
68025088
Test: runtest -x services/tests/servicetests/src/com/android/server/pm/dex/DexoptOptionsTests.java
Merged-In: I292ac7f355350edc8cf06f417740226ee6bac65d
Change-Id: I292ac7f355350edc8cf06f417740226ee6bac65d
Calin Juravle [Fri, 4 Aug 2017 08:42:17 +0000 (01:42 -0700)]
Record usage information per split
Increase the granularity of usage information to store data on each split
separately.
Now, splits get their own useByOtherApps flag and can be compiled
speed-profile when only the primary apk is loaded by other apps.
(cherry picked from commit
52a452cf685c56dc6872dbb19e822736484f672f)
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Merged-In: Ibf9e7b9e67db9c6f0f45dc695bce8fbeb7be20ae
Change-Id: Ibf9e7b9e67db9c6f0f45dc695bce8fbeb7be20ae
Calin Juravle [Mon, 7 Aug 2017 02:20:19 +0000 (19:20 -0700)]
Add package use info to dexopt dump
(cherry picked from commit
41a57a65b2a4fb51faa55bcba57ebe544e9f799f)
Bug:
64153885
Test: adb shell dumpsys package dexopt
Merged-In: I57768076de821980b1de84d5fe44ab642ceebeba
Change-Id: I57768076de821980b1de84d5fe44ab642ceebeba
Calin Juravle [Fri, 4 Aug 2017 02:48:37 +0000 (19:48 -0700)]
Use PackageUseInfo in DexOptimizer
Pass the PackageUseInfo directly to DexOptimizer and use it to detect if a
package is used by other apps. Move the usage checks closer to dexopt so
that they can be easily adapted when we add usage info for each of the
app's code paths separately.
This is a refactoring CLs to reduce the size and complexity of the
upcoming CLs which record the usage info for each of the application
splits.
(cherry picked from commit
3b74c41776da66562a68b12a0fed8d20b6952868)
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Merged-In: I8031590cdaff81ab1792ca19baddb6cb36dc021d
Change-Id: I8031590cdaff81ab1792ca19baddb6cb36dc021d
Calin Juravle [Sat, 22 Jul 2017 19:33:41 +0000 (12:33 -0700)]
Use the class loader context when optimizing secondary dex files
Record the class loader context for secondary dex loads and pass it to
dexopt during compilation.
The class loader context is passed from libcore every time a
BaseDexClassLoader is created and its recorded in the package dex usage
file.
Note that the context may be:
- unknown: if the dex file was not use after the the upgrade and its
context was not yet updated
- unsupported: if any of the class loaders from the loading context is
unsupported (only PathClassLoader and DelegateLastClassLoader are
supported).
- variable: if it changes over time, form one run to another.
In all the above cases the old compilation behavior is preserved for
now.(i.e. the dex file with be compiled with SKIP_SHARED_LIBRARY_CHECK)
(cherry picked from commit
f1ff36f0f99ebb41d0c7e0f3248506a56998fa3f)
Bug:
38138251
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/
adb shell cmd package compile -f -m quicken ^Csecondary-dex
com.google.android.gms
(cherry picked from commit
3bec94d78b0a66c4fa5cebd851ea33bcc51916b0)
Merged-In: Ie8b78c7c0d5de43733b3d116f8dcb3a65324cca8
Change-Id: Ie8b78c7c0d5de43733b3d116f8dcb3a65324cca8
Calin Juravle [Fri, 28 Jul 2017 23:13:35 +0000 (16:13 -0700)]
Save PackageDexUsage on PMS shutdown
This ensures that we persist the in memory data between restarts (makes
testing much easier).
(cherry picked from commit
14876bd21a4a4e7d78d36f910493269f14b2e905)
Bug:
64151900
Test: Manual, flash + restart + check the dex usage file
(cherry picked from commit
6ef7f0b8c6e72e849a220513425a9fd37804af90)
Merged-In: I7bd99fc03c3a40cbbf5d615886f857b5f84f438c
Change-Id: I7bd99fc03c3a40cbbf5d615886f857b5f84f438c
Calin Juravle [Tue, 25 Jul 2017 00:56:51 +0000 (17:56 -0700)]
Add DexClassLoader to the list of supported class loaders
DexClassLoader have the same behavior as PathClassLoader and is still in
use by apps. Add it to the list of supported class loaders so that it can be
recognized during secondary dex file loads.
(cherry picked from commit
f8c14e920ea2911ab7657de9bc3e0a834cd7e8b9)
Bug:
38138251
Bug:
36044779
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry picked from commit
d08b3156e8e908bae63dfd8f47c8e6f7ba98967f)
Merged-In: If02081d29f4d8ac917dacd877eb75985ea3895a9
Change-Id: If02081d29f4d8ac917dacd877eb75985ea3895a9
Calin Juravle [Sat, 4 Feb 2017 00:55:49 +0000 (16:55 -0800)]
Record dex files users in the dex-usage list
Add the users of the dex files in the package-dex-usage.list. This will
provide more data on why a package is marked as shared and not optimized
using profiles.
(cherry picked from commit
535a4753e313bdc2ae3e8be9f50606b82edcce0c)
Test: runtest -x .../DexManagerTests.java
users of the dex files are recorded in package-dex-usage.list
Bug:
63778376
Merged-In: I329bc929b17fa0afe1531f3e6879f6160157a787
Change-Id: I329bc929b17fa0afe1531f3e6879f6160157a787
Treehugger Robot [Wed, 1 Nov 2017 19:54:44 +0000 (19:54 +0000)]
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded"
Julia Reynolds [Thu, 26 Oct 2017 15:30:31 +0000 (11:30 -0400)]
Allow dnd access for secondary users
Test: runtest systemui-notification
Change-Id: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f
Merged-In: Ie63b767bcd25b7b3e7cac08afcf3351adc97263f
Fixes:
68060759
Jordan Liu [Wed, 1 Nov 2017 18:00:31 +0000 (18:00 +0000)]
Merge "Display the number of LTE signal bars is based on RSRP only"
am:
896dd7cdb7
Change-Id: Ic2bc88b627ba2110e16103f027843c7b90131e31
Narayan Kamath [Wed, 1 Nov 2017 17:50:16 +0000 (17:50 +0000)]
Merge "Debug: Remove obsolete InstructionCount code."
am:
f5a8edeaf0
Change-Id: Ia070e4dee54ac652545b174881defca2abbfd5df
Jordan Liu [Wed, 1 Nov 2017 17:47:58 +0000 (17:47 +0000)]
Merge "Display the number of LTE signal bars is based on RSRP only"
Narayan Kamath [Wed, 1 Nov 2017 17:39:12 +0000 (17:39 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"
am:
dc616ab11c
Change-Id: I6b4e8042eb9c657950157dcc49121b24efc196c1
Narayan Kamath [Wed, 1 Nov 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Debug: Remove obsolete InstructionCount code."
Treehugger Robot [Wed, 1 Nov 2017 17:23:27 +0000 (17:23 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"
Tobias Thierer [Wed, 1 Nov 2017 17:17:14 +0000 (17:17 +0000)]
make update-api
This CL almost exactly reverts http://r.android.com/471377 .
current.txt and friends were not reflecting the latest AOSP API,
ie. "make update-api" was not a no-op like it's supposed to be.
Apart from IpSecManager.SecurityParameterIndex.finalize(), this
seems to mostly revert http://r.android.com/471377 which suggests
that the tooling change that necessitated that CL was probably
reverted without "make update-api" being run on AOSP.
No further investigation was made for what CL(s) caused this or
whether any of this API change is undesired.
Test: Treehugger
Test: make update-api
Change-Id: I5b846627e38c47abb534def97f0cab9d28b1288c
TreeHugger Robot [Wed, 1 Nov 2017 16:38:14 +0000 (16:38 +0000)]
Merge "Federate platform docs against support library API file" into stage-aosp-master
Michael Wachenschwanz [Wed, 1 Nov 2017 15:49:39 +0000 (15:49 +0000)]
AAPT2: Allow for nested inline xmls
am:
c8f5fc284c
Change-Id: Ie80ba078d893d1b894d289645dae84fa2af58c40
Calin Juravle [Tue, 12 Sep 2017 07:58:33 +0000 (00:58 -0700)]
[framework] Add check that classpath is up to date to getDexOptNeeded
(cherry picked from commit
576e6c0cbb0231d6650dee70319d7443c601fa1b)
Bug:
62269291
Test: manual, install new apk/splits and force updates.
I used com.android.cts.classloadersplitapp as the test app.
1) install-multiple split apks with dependency: Base -> A -> B
2) push an update for A
3) adb shell cmd package compile
4) check that A & B got recompiled and that B was because a class loader
context mismatch (e.g. "ClassLoaderContext classpath element checksum
mismatch for position 1.").
Merged-In: I4092562966413dc8976c9d41b26a90bbb9e37e1e
Change-Id: I4092562966413dc8976c9d41b26a90bbb9e37e1e
Narayan Kamath [Wed, 1 Nov 2017 15:01:48 +0000 (15:01 +0000)]
PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive
This is a temporary hack while we sort out the larger issues.
Test: make & flash
Bug:
68755013
Change-Id: I39f2e7f2e39f4d886ea5fa3d91648404347485ef
Narayan Kamath [Tue, 30 May 2017 17:04:36 +0000 (18:04 +0100)]
Debug: Remove obsolete InstructionCount code.
Support for instruction counting has been removed from ART
and the VMDebug APIs in question throw UnsupportedOperationException
unconditionally.
Test: make
Change-Id: Ibcaa160f755a5708bc6fbef3a783acfc26f0ba90
Charles He [Tue, 31 Oct 2017 09:35:15 +0000 (09:35 +0000)]
TokenWatcher: fix bug in repeated calls to acquire().
The javadoc of TokenWatcher promised to implement repeated calls to
acquire() with the same token as a no-op, but this wasn't the case.
When acquire() is called repeatedly with the same token, its associated
DeathRecipient object is replaced by a new one. The old DeathRecipient
can therefore be destroyed. This is problematic because the finalizer of
this DeathRecipient implementation calls release() on the same token,
resulting in the token being released unexpectedly.
In this CL we properly implement the documented no-op behavior.
Bug:
68368071
Test: (First, cherry-pick to internal master)
Test: cts-tradefed run cts-dev -m OsTest -t android.os.cts.TokenWatcherTest
Test: CTS verifier > Managed provisioning > Device owner tests
> LockTask UI
Change-Id: Idfad7c88075a510ea1f8527b5a8620121a5dd7bb
Wenting Xiong [Wed, 18 Oct 2017 06:05:49 +0000 (15:05 +0900)]
Display the number of LTE signal bars is based on RSRP only
Some carriers require to display the number of LTE signal bars is
based on RSRP only.
This carrier config is used to control it.
Test: manual - Checked that the number of LTE signal bars display
which base on RSRP only can be controlled by carrier config.
Bug:
67831028
Change-Id: I077ef253f34fc503a591dcb3f01d60ab6573f298
Calin Juravle [Wed, 1 Nov 2017 03:02:34 +0000 (03:02 +0000)]
Merge "Change the location of current profiles for secondary dex files" am:
80c3c70930
am:
babf30ed97 -s ours
Change-Id: If6b337b351ffa637da6fd52def6b937d250e5522
Calin Juravle [Wed, 1 Nov 2017 02:51:28 +0000 (02:51 +0000)]
Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd am:
2b1357fe90
am:
e9e84a1dca -s ours
Change-Id: I25e1264c880dbc54f5e67ee98eac566bbdf4536b
Calin Juravle [Wed, 1 Nov 2017 02:48:59 +0000 (02:48 +0000)]
Merge "Change the location of current profiles for secondary dex files"
am:
80c3c70930
Change-Id: I5ece1daa5796915c0dc6d19e791a0e81c311feb7
Calin Juravle [Wed, 1 Nov 2017 02:43:04 +0000 (02:43 +0000)]
Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd
am:
2b1357fe90
Change-Id: Iee60be352c2e742fdd1d3f7ce15e58e455ac1ead
Shubham Ajmera [Wed, 1 Nov 2017 02:41:28 +0000 (02:41 +0000)]
Merge "Reduce app size by downgrading inactive apps" am:
8bcd66d35f
am:
b11556fcf6 -s ours
Change-Id: I3daf016f968eeae3010fcde9d079b7f9ff2d7e48
Shubham Ajmera [Wed, 1 Nov 2017 02:31:46 +0000 (02:31 +0000)]
Merge "Reduce app size by downgrading inactive apps"
am:
8bcd66d35f
Change-Id: I4bfba3f7eb16442a7a69466cf72b22198acde6c4
Treehugger Robot [Wed, 1 Nov 2017 02:22:48 +0000 (02:22 +0000)]
Merge "Change the location of current profiles for secondary dex files"
Treehugger Robot [Wed, 1 Nov 2017 02:21:42 +0000 (02:21 +0000)]
Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd
* changes:
Fix splits class loader context for non dependant splits
Encode the entire class loader context for dex2oat
Add a command line option to optimize individual splits
Refactor the arguments passed to dexopt invocations
Treehugger Robot [Wed, 1 Nov 2017 02:19:57 +0000 (02:19 +0000)]
Merge "Reduce app size by downgrading inactive apps"
Hall Liu [Thu, 26 Oct 2017 00:19:19 +0000 (17:19 -0700)]
Add @TestApi for EMBMS APIs needed for CTS
Bug:
68049452
Test: CTS
Change-Id: I5d132ac4e67deccf41c998822f82cf94d3f2ce7f
Bryce Lee [Tue, 31 Oct 2017 18:35:55 +0000 (11:35 -0700)]
DO NOT MERGE Remove orientation restriction to only fullscreen activities.
This changelist removes checks that enforce that only fullscreen,
opaque activities may request orientation changes. An application
may itself be compatible with the change and update their SDK level.
However, it is possible they use a library that has not itself been
updated and still leverages this feature for non-fullscreen
activities.
Fixes:
68684796
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: Ib5a60f0b660ad145d07e953e541a0a1b801aeef2
Andreas Huber [Wed, 1 Nov 2017 00:03:34 +0000 (00:03 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob." am:
a546c38130
am:
33569ca480
Change-Id: Ic3048cf4539b112027089726b529e3c0838c40f4
Mathieu Chartier [Tue, 31 Oct 2017 23:57:53 +0000 (23:57 +0000)]
Merge changes I2ef3737f,If080281f am:
bb3de35e5f
am:
18a93665a0 -s ours
Change-Id: Ic8b4862eca342e5b9705c16879d800005a2291bf
Jeff Sharkey [Tue, 31 Oct 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Change storage migration to use quota APIs." am:
0fccecc6a0
am:
83fabf2fd6 -s ours
Change-Id: I9023d8214f0f899d6065a074a92e80dea7359280
Steven Moreland [Tue, 31 Oct 2017 23:40:34 +0000 (23:40 +0000)]
Merge "Reland "HIDL Java getService now the same as C++."" am:
c1616f6820
am:
0c6f0240b2
Change-Id: I35ee525aaa1563cc6d8fde5dac1e38e04803bb38
Michael Wachenschwanz [Tue, 31 Oct 2017 02:06:23 +0000 (19:06 -0700)]
AAPT2: Allow for nested inline xmls
Add recursion to InlineXmlFormatParser::Consume for handling nested
aapt:attr
Change-Id: Iabf98945b4f5ef22a3b8fdc4ca2bac092a377629
Fixes:
64385167
Test: make aapt2_tests
(cherry picked from commit
7b6b02bd13aea90b938c3ab3b1eaa3fb5043f931)
Andreas Huber [Tue, 31 Oct 2017 23:08:26 +0000 (23:08 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob."
am:
a546c38130
Change-Id: I969ec51ed8fc6c7e11e7cfe7c4e1a3d6aa5802de
Treehugger Robot [Tue, 31 Oct 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Adds APIs to extract/import arrays of primitive Java types out of/into a HwBlob."