OSDN Git Service
Jack Yu [Fri, 3 Nov 2017 02:02:06 +0000 (02:02 +0000)]
Merge "Merge "Added default home values of CDMA roaming indicator" am:
a7c51a3d7f" into stage-aosp-master
am:
55636146d5
Change-Id: Ic9f26d50bf0059e0bc5330dc12d15eb04caba473
Calin Juravle [Fri, 3 Nov 2017 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "[framework] Compile secondary dex files in isolation" am:
e9e3bfe353" into stage-aosp-master
am:
2dcee11c41 -s ours
Change-Id: Ia5d6d12e917ac4a4b6cce926b61d300c3feb2541
Calin Juravle [Fri, 3 Nov 2017 01:39:11 +0000 (01:39 +0000)]
Merge "[framework] Compile secondary dex files in isolation" am:
e9e3bfe353
am:
c14fcf466a -s ours
Change-Id: Ib5d2cc1ae84c270ce81bc44f6b413f3288a7b68a
Android Build Merger (Role) [Fri, 3 Nov 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Merge "Added default home values of CDMA roaming indicator" am:
a7c51a3d7f" into stage-aosp-master
Jack Yu [Fri, 3 Nov 2017 01:35:29 +0000 (01:35 +0000)]
Merge "Added default home values of CDMA roaming indicator"
am:
a7c51a3d7f
Change-Id: Ia178ace4de625a358f284283fb4a5e5c9b4f7dd4
Android Build Merger (Role) [Fri, 3 Nov 2017 01:31:51 +0000 (01:31 +0000)]
Merge "Merge "[framework] Compile secondary dex files in isolation" am:
e9e3bfe353" into stage-aosp-master
Calin Juravle [Fri, 3 Nov 2017 01:30:30 +0000 (01:30 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am:
e9e3bfe353
Change-Id: I8f0d9303b3656a298700e26a377d89b7fdd81b4e
Calin Juravle [Fri, 3 Nov 2017 01:21:27 +0000 (01:21 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am:
e9e3bfe353
Change-Id: I7e09a8d5f03b77fa73f13e045e2ec7a2b26eb486
Treehugger Robot [Fri, 3 Nov 2017 01:13:27 +0000 (01:13 +0000)]
Merge "Added default home values of CDMA roaming indicator"
Felipe Leme [Fri, 3 Nov 2017 01:08:10 +0000 (01:08 +0000)]
Added missing AutofillEventType so lint doesn't complain.
am:
3dec72b601
Change-Id: I858b95d6b94343c5d6c596c30adf4ad6baa772e6
Treehugger Robot [Fri, 3 Nov 2017 01:05:05 +0000 (01:05 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
Jack Yu [Thu, 2 Nov 2017 17:08:10 +0000 (10:08 -0700)]
Added default home values of CDMA roaming indicator
Some carriers use the standard roaming indicator number
assigment for roaming indication. Added the default home values
suggested by 3GPP2 C.R1001 table 8.1-1.
Test: Manual
bug:
67855275
Change-Id: Ib0a613ad8caba74645930f3e5188999be08b2116
(cherry picked from commit
cf4a8b40a2ff0496c4ccf08f251c0c425fd673f0)
Andreas Gampe [Thu, 2 Nov 2017 22:21:57 +0000 (22:21 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared" am:
eb3bff53f6
am:
6f8a3cee0e
Change-Id: Ic2399e02d2102f984defb92c29b3568b94ebb244
Andreas Gampe [Thu, 2 Nov 2017 22:13:37 +0000 (22:13 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
am:
eb3bff53f6
Change-Id: I285d7cf715dc0b2e08d7003cecfd92bfc3b9c8da
Treehugger Robot [Thu, 2 Nov 2017 21:57:29 +0000 (21:57 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
Felipe Leme [Thu, 2 Nov 2017 20:42:17 +0000 (13:42 -0700)]
Added missing AutofillEventType so lint doesn't complain.
Test: In TreeHugger we trust!
Fixes:
68806712
Change-Id: I2f392161e71e0eca25a4a104b67e7d2982c90341
con [Thu, 2 Nov 2017 20:28:26 +0000 (20:28 +0000)]
Merge "Fix StateMachine init/quit race." am:
5c7de22a06
am:
1ef2e98a14
Change-Id: If46700cb9701154c97baa8be28457f5fce30ce54
con [Thu, 2 Nov 2017 20:15:35 +0000 (20:15 +0000)]
Merge "Fix StateMachine init/quit race."
am:
5c7de22a06
Change-Id: I26ab138d66366efbcc515e5da0ed21de3e90fa9a
con [Thu, 2 Nov 2017 20:05:09 +0000 (20:05 +0000)]
Merge "Fix StateMachine init/quit race."
Andreas Huber [Thu, 2 Nov 2017 19:10:04 +0000 (19:10 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive" am:
80bb035d4e
am:
89ebce3337
Change-Id: Ia3abede66803190d1a6ec4ac141eb851207ce05d
Calin Juravle [Thu, 2 Nov 2017 18:59:16 +0000 (18:59 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick" am:
5e5fc34b42
am:
64e4210099 -s ours
Change-Id: I53aa31310ebf9e1486ad7172e5fd75eb1509ff2d
Andreas Huber [Thu, 2 Nov 2017 18:58:30 +0000 (18:58 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
am:
80bb035d4e
Change-Id: I35bdd8fe5b80917b8b574e97f10f77df59045efd
Calin Juravle [Thu, 2 Nov 2017 18:55:30 +0000 (18:55 +0000)]
Fix spelling mistake in dumpsys output am:
527a2b205c
am:
fa4c521414 -s ours
Change-Id: I36e808545c34205bf2f3c4f4de457ad3999cf1c5
Calin Juravle [Thu, 2 Nov 2017 18:44:34 +0000 (18:44 +0000)]
Merge "Handle configuration splits when creating the class loader context" am:
88946d4cf2
am:
ee41710ef5 -s ours
Change-Id: I3a80cea56b5a310f8c0e9c6eff5586e98fe5df42
Calin Juravle [Thu, 2 Nov 2017 18:44:10 +0000 (18:44 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick"
am:
5e5fc34b42
Change-Id: I5af5a20cae531d5fc93faae00dfbe399f08da766
Calvin On [Wed, 1 Nov 2017 20:37:18 +0000 (13:37 -0700)]
Fix StateMachine init/quit race.
The quitNow method places the SM_QUIT_CMD at the front
of the queue. This can cause StateMachine to throw exception
if it has not yet processed the SM_INIT_CMD from start().
Bug:
67370902
Test: make checkbuild
Test: StatMachineTest unittest
Change-Id: I409242845854e70b77ad9b2378b69faed076847c
Merged-In: I7cec7bb91e0447e3c565d33cb7c34ccf59566639
Calin Juravle [Thu, 2 Nov 2017 18:39:26 +0000 (18:39 +0000)]
Fix spelling mistake in dumpsys output
am:
527a2b205c
Change-Id: I3bffb95e459adcf0457479f3b87583ba7600fc03
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
Treehugger Robot [Thu, 2 Nov 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Use ScopedPrimitiveArrayRO instead of manually managing Java primitive"
Calin Juravle [Thu, 2 Nov 2017 18:28:41 +0000 (18:28 +0000)]
Merge "Handle configuration splits when creating the class loader context"
am:
88946d4cf2
Change-Id: I1ed3175ef2094979477dca44b5f0bf56eb34d880
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:13:54 +0000 (18:13 +0000)]
Merge changes from topic "explicit_shared_compile_reason_cherrypick"
* changes:
Add an explicit reason for the compilation of shared apks
Fix spelling mistake in dumpsys output
Treehugger Robot [Thu, 2 Nov 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Handle configuration splits when creating the class loader context"
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 [Wed, 4 Oct 2017 17:53:09 +0000 (10:53 -0700)]
[framework] Compile secondary dex files in isolation
The class loader context adds the overhead of extracting in-memory and
possibly extra verification which is being frowned upon when the loading
happens on the UI thread. Revert the correct fix of compiling secondary
dex files with their loading context until b/
64530081 is done.
Partial revert of commit
f1ff36f0f99ebb41d0c7e0f3248506a56998fa3f.
(cherry picked from commit
27f926212483e8291a63884e60fa44de4d0df17c)
Test: adb shell cmd package compile -m quicken -f --secondary-dex
com.google.android.gms
Bug:
64530081
Bug:
66984396
Merged-In: Ib2815ce67b224883fe95c28d1424103e56342c6e
Change-Id: Ib2815ce67b224883fe95c28d1424103e56342c6e
Andreas Gampe [Thu, 2 Nov 2017 16:35:28 +0000 (09:35 -0700)]
PMSCompilerMapping: Hardcode a value for pm.dexopt.shared
This is a temporary hack while we sort out the larger issues.
Test: make & flash
Bug:
68755013
Change-Id: I59caf79027dd8be2fd698606822a20b19c0d942a
Calin Juravle [Fri, 15 Sep 2017 18:09:29 +0000 (11:09 -0700)]
Add an explicit reason for the compilation of shared apks
Some devices might find it more beneficial to compile shared apks like gms
or gms modules with quicken rather then speed.
(cherry picked from commit
f53201f8c796e8500b76b72e4fad6269d8547369)
Bug:
65591595
Test: build
Merged-In: I90b79e9f6bc4b4d6b3f5c0b90ab95e8880c4ac9d
Change-Id: I90b79e9f6bc4b4d6b3f5c0b90ab95e8880c4ac9d
Calin Juravle [Tue, 26 Sep 2017 20:23:00 +0000 (13:23 -0700)]
Fix spelling mistake in dumpsys output
(cherry picked from commit
94837e35e3c149e81da90f312fbb37f22c8bc90e)
Bug:
65843255
Test: build
Merged-In: Icc748dd14b52641e37b149f51d61a4086e55ed41
Change-Id: Icc748dd14b52641e37b149f51d61a4086e55ed41
Calin Juravle [Sat, 2 Sep 2017 00:30:01 +0000 (17:30 -0700)]
Handle configuration splits when creating the class loader context
Configuration splits have no dependencies which can lead to exceptions
when computing their class loader context.
In general, we do not need to compute the class loader context for apks
without code.
This CL addresses the issue by ignoring "code" paths with no actual code.
(cherry picked from commit
da09815e2cd3d3968c66a8d52e620ee07d8204dd)
Bug:
65159159
Test: adb install-multiple config_splits
runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
Merged-In: Ida1eb901eecba4a4266de73022f6ee4659367873
Change-Id: Ida1eb901eecba4a4266de73022f6ee4659367873
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