OSDN Git Service
Doris Ling [Wed, 29 Mar 2017 17:40:45 +0000 (17:40 +0000)]
Merge "Reserve space for preference icon." into oc-dev
am:
ddb280b1ac
Change-Id: I18d2e90badb48f972dd6fd627c890062a2887324
Etan Cohen [Wed, 29 Mar 2017 17:39:04 +0000 (17:39 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
am:
6fd057cf58 -s ours
Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998
TreeHugger Robot [Wed, 29 Mar 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Reserve space for preference icon." into oc-dev
Etan Cohen [Wed, 29 Mar 2017 17:32:13 +0000 (17:32 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
Etan Cohen [Wed, 29 Mar 2017 17:19:50 +0000 (17:19 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d am:
9bc8e05da2
am:
342a27e7f7
Change-Id: I5b4d9ea932373e8dd82e846d2c31995b23329fff
Etan Cohen [Wed, 29 Mar 2017 17:14:04 +0000 (17:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d
am:
9bc8e05da2
Change-Id: If90e1b691bff1ae6f6a13c59836ad210df38f6d6
Etan Cohen [Wed, 29 Mar 2017 17:08:51 +0000 (17:08 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am:
5d81b9d67d
Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
Etan Cohen [Wed, 29 Mar 2017 17:03:41 +0000 (17:03 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
Rob Carr [Wed, 29 Mar 2017 16:51:22 +0000 (16:51 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
am:
76d779374a
Change-Id: Iae347650a9ad3f8735f83eba95ae655137c2c06c
Rob Carr [Wed, 29 Mar 2017 16:44:36 +0000 (16:44 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
Geoffrey Pitsch [Wed, 29 Mar 2017 15:41:55 +0000 (15:41 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev
am:
1af2928767
Change-Id: I9315cb5a2fde7e238ed4f90e9608c82565f582c8
TreeHugger Robot [Wed, 29 Mar 2017 15:34:58 +0000 (15:34 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev
Etan Cohen [Wed, 29 Mar 2017 15:14:30 +0000 (15:14 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b am:
c24d7f781a
am:
7060ae081b
Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b
Etan Cohen [Wed, 29 Mar 2017 15:09:28 +0000 (15:09 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b
am:
c24d7f781a
Change-Id: Id3901b3bec685b25297c36d19d9b23a035a00e0c
Etan Cohen [Tue, 28 Mar 2017 17:31:47 +0000 (10:31 -0700)]
[AWARE] Fix unit tests
Update to reflect new mockito semantics.
No functional change, no change to test semantics!
(cherry-pick of commit
afddcc3c9860fecfdb3ed72fafb09d73e8549411)
Bug:
36680830
Test: unit tests now passing
Merged-In: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Etan Cohen [Wed, 29 Mar 2017 15:04:28 +0000 (15:04 +0000)]
Merge "[AWARE] Fix unit tests"
am:
de8e09409b
Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
Etan Cohen [Wed, 29 Mar 2017 14:56:40 +0000 (14:56 +0000)]
Merge "[AWARE] Fix unit tests"
Diego Perez [Wed, 29 Mar 2017 13:31:15 +0000 (13:31 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev
am:
92b3242827
Change-Id: If398e8b30b96e5e9ba815076638c1d96878ee60d
TreeHugger Robot [Wed, 29 Mar 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev
Geoffrey Pitsch [Wed, 29 Mar 2017 13:19:50 +0000 (09:19 -0400)]
Re-enable throw when notifications posted can't find channel
Only applies for non-user builds, and for apps that have tried using
channels.
Test: runtest systemui-notification
Change-Id: I7e28545ba28eadae75bf015bdf490093223e2940
Tony Mak [Wed, 29 Mar 2017 12:14:40 +0000 (12:14 +0000)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue
am:
ec319aba34
Change-Id: I41eb1a9f2e3dd97b5318c3dee92c73e4d531966b
Diego Perez [Wed, 29 Mar 2017 11:03:58 +0000 (12:03 +0100)]
Add audio service support to BridgeContext
Bug: http://b.android.com/259326
Test: N/A
Change-Id: Ie43ccca49a5e77d82426b4f265e3c05dddfacad9
Tony Mak [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue
Problem:
Work profile status bar icon feeature is relied on two callbacks
1. onForegroundProfileSwitch (AMS.setResumedActivityLocked)
2. appTransitionStarting (WMS)
We assume callback 1 is always called before 2, but it is not the case.
These two callbacks are triggered by two handlers in two different threads,
and hence race condition happens.
Solution:
Not rely on onForegroundProfileSwitch to update mManagedProfileFocused
flag anymore. Query getLastResumedActivityUserId in appTransitionStarting.
Also, make sure mLastResumedActivity is updated before sending message
to WMS in setResumedActivityLocked.
Test: Start a work app, observe that the work icon is shown.
Test: Start a personal app, observe that work icon is gone.
Test: Dock the work app, tap on it (give it focus), observe that work
icon is shown.
Test: Start a work app, switch user, can see the icon is gone. Switch back,
icon is back.
Bug:
34159089
Change-Id: I2cee141d18e8b7d5607b26dd7a2fd5bc9cd0ebb3
Daichi Hirono [Wed, 29 Mar 2017 04:49:43 +0000 (04:49 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
am:
76c32a35a9
Change-Id: I9e17751f706f9e0869eefafb77bf1704335f5116
Stephen Chen [Wed, 29 Mar 2017 04:43:39 +0000 (04:43 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev
am:
3938580b86
Change-Id: If62e361cd59a8bb64bfdf585bbc50a7f4df640bd
TreeHugger Robot [Wed, 29 Mar 2017 04:41:38 +0000 (04:41 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 04:37:07 +0000 (04:37 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev
Jeff Tinker [Wed, 29 Mar 2017 01:49:06 +0000 (01:49 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods"
am:
79a973f643
Change-Id: Ibd6a0b5ddac4b28aec4ed038e04d86c79264bdbc
Calin Juravle [Wed, 29 Mar 2017 01:36:16 +0000 (01:36 +0000)]
Merge changes from topic 'dex' am:
f665781c74 am:
8a4afd3dad
am:
5949d0dcdc -s ours
Change-Id: Ic85e62a9ad2a7c1bd04a70776ebeb816a67a4e72
Calin Juravle [Wed, 29 Mar 2017 01:32:10 +0000 (01:32 +0000)]
Merge changes from topic 'dex' am:
f665781c74
am:
8a4afd3dad
Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c
Calin Juravle [Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)]
Merge changes from topic 'dex'
am:
f665781c74
Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
Jeff Tinker [Wed, 29 Mar 2017 01:10:54 +0000 (01:10 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods"
This reverts commit
599be3d01ed1811ae365085e67a15d082170b583.
This change is being reverted because it broke git_master build.
Change-Id: I54ab9cd3d9e08dcf870f472fda08cc44e57986d0
bug:
34703669
Calin Juravle [Wed, 29 Mar 2017 01:19:57 +0000 (01:19 +0000)]
Merge changes from topic 'dex'
* changes:
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Register secondary dex files for JIT profiling
Move DexLoadReporter out of LoadedApk
Set pm.BackgroundDexOptService as the source of true
Add missing return in DexManager
Update package use info when the app data is updated
Stephen Chen [Wed, 29 Mar 2017 01:14:17 +0000 (18:14 -0700)]
Change string connected_via_network_scorer_default.
Bug:
36629448
Test: make
Change-Id: I06945a64b54d7e41c542ec36ef45eb7c8cb7bf10
Casey Burkhardt [Wed, 29 Mar 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev
am:
684607f7f6
Change-Id: I34b40003f5336c68bb6725ba8cc8023495f1f4bf
Casey Burkhardt [Wed, 29 Mar 2017 01:05:33 +0000 (01:05 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev
Conrad Chen [Wed, 29 Mar 2017 00:50:18 +0000 (00:50 +0000)]
Merge "TIF: open transient columns to public" into oc-dev
am:
438be2af18
Change-Id: Ib96f324a3a04d1bce97f64c3d99a524ee9a353d1
Android Build Merger (Role) [Wed, 29 Mar 2017 00:49:00 +0000 (00:49 +0000)]
Merge "Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da am:
75172f2909 am:
2b38993bef" into oc-dev-plus-aosp
Yifan Hong [Wed, 29 Mar 2017 00:48:01 +0000 (00:48 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da am:
75172f2909
am:
2b38993bef
Change-Id: Ieda97ba519f5dc35efa54ae4457737df585b8dc2
Ammar Aijazi [Wed, 29 Mar 2017 00:46:34 +0000 (00:46 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev
am:
334220984e
Change-Id: I48d20978f1382f0c053ffd83ad772fa4b6b5cf1a
Conrad Chen [Wed, 29 Mar 2017 00:46:04 +0000 (00:46 +0000)]
Merge "TIF: open transient columns to public" into oc-dev
Yifan Hong [Wed, 29 Mar 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da
am:
75172f2909
Change-Id: I173a10744b83e144c19d5fc9167cac40d07aef92
TreeHugger Robot [Wed, 29 Mar 2017 00:42:21 +0000 (00:42 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev
Yifan Hong [Wed, 29 Mar 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
am:
383391c5da
Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1
Tianjie Xu [Wed, 29 Mar 2017 00:34:13 +0000 (00:34 +0000)]
Merge "Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288 am:
bc0865bc78" into oc-dev
am:
b25b2f2dab
Change-Id: I97915632d1dfac51cac8cfa36cfc2465c67572d3
Treehugger Robot [Wed, 29 Mar 2017 00:32:18 +0000 (00:32 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
Tianjie Xu [Wed, 29 Mar 2017 00:29:01 +0000 (00:29 +0000)]
Merge "Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288 am:
bc0865bc78" into oc-dev
Daichi Hirono [Wed, 8 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Allow apps to process ProxyFDCallback asynchrnously.
Previously callback methods of ProxyFileDescriptorCallback were invoked
on a background thread prepared in the framework. So all methods were
invoked and processed synchronously. This was problem because if it took
time to fetch bytes of one file, operations for other files were also
blocked.
The CL changes ProxyFileDescriptorCallback methods to be invoked on
Handler passed by apps. Now application can prepare a Handler per file
so that one file does not block others.
Bug:
35229514
Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.storage.cts.StorageManagerTest#testOpenProxyFileDescriptor_async
Change-Id: Ibadc4aad4c0373a3da586459a8f775e40288c895
(cherry picked from commit
4f156065c860d916b649e2b464e9405cafc732e9)
George Mount [Tue, 28 Mar 2017 23:48:39 +0000 (23:48 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
am:
c8d8c27c68
Change-Id: I3324c7b31834ab429ec3b38d4035fe3dd9e3c9b2
TreeHugger Robot [Tue, 28 Mar 2017 23:43:15 +0000 (23:43 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
Andreas Gampe [Tue, 28 Mar 2017 23:24:25 +0000 (23:24 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
am:
f7d650e89a
Change-Id: I740ffa8fe5a8a797f7c0dbce0a8af7a83248bd56
TreeHugger Robot [Tue, 28 Mar 2017 23:17:58 +0000 (23:17 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
Andrii Kulian [Tue, 28 Mar 2017 23:05:09 +0000 (23:05 +0000)]
Merge "Move activity to display on launch" into oc-dev
am:
5c5bf24033
Change-Id: I26c0eac1301e221fa5460b0291ea64c298da150d
Casey Burkhardt [Tue, 28 Mar 2017 22:52:12 +0000 (15:52 -0700)]
Ensures Accessibility button always overrides IME switcher
In the case of both the IME switcher and Accessibility button
appearing within NavigationBarView, we want to allow the
accessibility button to always override the appearance of the IME
switcher as our target users will most-often be using
dead-reckoning to interact with the Accessibility button,
requiring consistent appearance, location, and visibility.
Bug:
35267032
Test: Manual
Change-Id: Ib39d2336efe7073f686d94b3f71fc853af3186bb
Calin Juravle [Fri, 10 Mar 2017 02:41:10 +0000 (18:41 -0800)]
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
a70b1b120365976f5eeb7cb3f577f5f6ff7ad18e)
Merged-In: Iaee8071449c83e774b2fe331aaccfc5433856f4f
Change-Id: I2334e4d73a5acdd1106e913c59ddf642782f1eee
Calin Juravle [Tue, 14 Mar 2017 06:30:30 +0000 (23:30 -0700)]
Register secondary dex files for JIT profiling
Test: boot, and check that profiles get recorded for secondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
f5a7bfc8d5f9e74d6fa1e5be3246e7b4cde65bf6)
Merged-In: I2de23ef44eee3f1783ae698821f1c6d88c66c9a6
Change-Id: Id9bbd630b8485dc17eeef846295458df5cfe446a
TreeHugger Robot [Tue, 28 Mar 2017 22:52:56 +0000 (22:52 +0000)]
Merge "Move activity to display on launch" into oc-dev
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
Doris Ling [Mon, 27 Mar 2017 20:32:04 +0000 (13:32 -0700)]
Reserve space for preference icon.
Add an attribute to Preference to specify whether the space of the icon
view should be reserved when no preference icon is provided.
Bug:
36448695
Test: manual
Change-Id: I03b49fe93d54bb9106cf167a677a9ea544a3e3a1
Brad Ebinger [Tue, 28 Mar 2017 22:44:30 +0000 (22:44 +0000)]
Merge "Remove non-localized message" am:
ddbd256954 am:
70a09c00e5
am:
9c7b7f0de7
Change-Id: Ifc9f2278c7497f357b7db82ed27e6083351bf84b
Ammar Aijazi [Tue, 28 Mar 2017 22:43:22 +0000 (15:43 -0700)]
NetworkPolicy gets updated due to CarrierConfigManager updates.
Bug: b/
34385985
Test: Added unit tests to NetworkPolicyManagerServiceTest
Change-Id: I1d8249081c478e6484c8011d3eab73a53f105fac
Brad Ebinger [Tue, 28 Mar 2017 22:40:26 +0000 (22:40 +0000)]
Merge "Remove non-localized message" am:
ddbd256954
am:
70a09c00e5
Change-Id: I19c34a0ee59615ef8bf4d70fbeff993404929a57
Brad Ebinger [Tue, 28 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Remove non-localized message"
am:
ddbd256954
Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
Makoto Onuki [Tue, 28 Mar 2017 22:28:20 +0000 (22:28 +0000)]
Merge "Correctly set thread group to UiThread's thread." into oc-dev
am:
479bb430d1
Change-Id: I59b38f14864d12aff442cdf5a92b64a56c35dc19
Tianjie Xu [Tue, 28 Mar 2017 20:12:14 +0000 (20:12 +0000)]
Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288
am:
bc0865bc78
Change-Id: I65bc4945d0701ecc10fd41f827c4566dfea912f9
(cherry picked from commit
ee45a1f3abd50a7451cfd7b6d7e48b778021bac5)
Brad Ebinger [Tue, 28 Mar 2017 22:21:53 +0000 (22:21 +0000)]
Merge "Remove non-localized message"
Makoto Onuki [Tue, 28 Mar 2017 22:19:01 +0000 (22:19 +0000)]
Merge "Correctly set thread group to UiThread's thread." into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 22:10:46 +0000 (22:10 +0000)]
Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev
am:
e56bfe0012
Change-Id: I9743b382b9d7156576f7962e38971ef73aa2322a
Makoto Onuki [Tue, 28 Mar 2017 22:03:04 +0000 (22:03 +0000)]
Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev
Andrii Kulian [Tue, 28 Mar 2017 21:50:58 +0000 (21:50 +0000)]
Merge "Add Configuration param to onMovedToDisplay" into oc-dev
am:
36e2483663
Change-Id: I4deb6bcfb5facad1e0f85e66a149af88cbab04c2
Makoto Onuki [Tue, 28 Mar 2017 21:12:34 +0000 (14:12 -0700)]
Log a warning if a dispatch on UiThread takes more than
a certain amount of time.
Bug:
34961340
Test: Boot and launch several apps.
Change-Id: I38bd85a1dd9c572242d04f550df4a979f5f3bea5
Jason Monk [Tue, 28 Mar 2017 21:43:32 +0000 (21:43 +0000)]
Merge "Don't allow settings launch when user isn't setup" into oc-dev
am:
03435f75fa
Change-Id: I215923090ac89d856d0054314aa343b54f86154d
Jason Monk [Tue, 28 Mar 2017 21:42:32 +0000 (21:42 +0000)]
Update default QS tile order
am:
d1f7f1e1c6
Change-Id: Ic271e9416e502037f1d77f09c8edbb6d82b4c95b
TreeHugger Robot [Tue, 28 Mar 2017 21:36:34 +0000 (21:36 +0000)]
Merge "Add Configuration param to onMovedToDisplay" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 21:26:43 +0000 (21:26 +0000)]
Merge "Don't allow settings launch when user isn't setup" into oc-dev
Jason Monk [Mon, 27 Mar 2017 15:17:04 +0000 (11:17 -0400)]
Don't allow settings launch when user isn't setup
Test: runtest systemui
Change-Id: Ia0c90f981b9d45e8e3e8c09771d4baa8ab9fabff
Fixes:
31737292
(cherry picked from commit
7d596d522c06e768e7ff511da30cd3ddfa781223)
Jason Monk [Mon, 27 Mar 2017 14:51:34 +0000 (10:51 -0400)]
Update default QS tile order
Test: visual
Change-Id: Ia28b7b074a240465598fc3559cd3bd3c584fcc5d
Fixes:
36402044
(cherry picked from commit
9f05491cc0b937cb6f10444154be424f0bb29001)
Makoto Onuki [Tue, 28 Mar 2017 21:16:01 +0000 (21:16 +0000)]
Merge "Don't do heavy work on UiThread." into oc-dev
am:
881a623e35
Change-Id: I9fc313d80f4177b64724080e63a728fce30e9c3c
Makoto Onuki [Tue, 28 Mar 2017 21:08:40 +0000 (21:08 +0000)]
Merge "Don't do heavy work on UiThread." into oc-dev
Todd Kennedy [Tue, 28 Mar 2017 21:02:18 +0000 (21:02 +0000)]
Merge "Intercept direct launch of instant app installer" into oc-dev
am:
61ae34afe3
Change-Id: Iafec525f0b70c87e8a6362a37a9c508541faa740
Todd Kennedy [Tue, 28 Mar 2017 21:01:16 +0000 (21:01 +0000)]
Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
am:
1b782bffdf
Change-Id: Ia15934bb7a40be04d32c0c9418ed8a8d8bd2c1c7
Todd Kennedy [Tue, 28 Mar 2017 21:00:16 +0000 (21:00 +0000)]
Merge "Add extra flag to ApplicationInfoFlags" into oc-dev
am:
01d69aae3a
Change-Id: I6ff9abe0cafd62e5160483fca547f33822bde731
Chad Brubaker [Tue, 28 Mar 2017 20:59:17 +0000 (20:59 +0000)]
Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev
am:
f0fb78b95d
Change-Id: I2ddd5efd4d2579cc2f0eae0dd6119cf939ae3534
Shunta Sato [Tue, 28 Mar 2017 20:52:20 +0000 (20:52 +0000)]
Merge "Don't allow the negative height of ListPopupWindow" into oc-dev
am:
adcb8c8a62
Change-Id: Iaa38eb853169a6b8ca98d59f88116bd70a597838
Andreas Gampe [Tue, 28 Mar 2017 20:49:26 +0000 (20:49 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am:
cbcb388d82 am:
9f6dc54c29
am:
513ef1d495
Change-Id: I4b341ccad2f2e8b6eb03ebac99dd6b2503933649
TreeHugger Robot [Tue, 28 Mar 2017 20:47:06 +0000 (20:47 +0000)]
Merge "Intercept direct launch of instant app installer" into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 18:25:47 +0000 (11:25 -0700)]
Don't do heavy work on UiThread.
Bug
34961340
Test: manual test
Test: adb shell am instrument -e class com.android.server.NetworkPolicyManagerServiceTest -w com.android.frameworks.servicestests
(except for flakey ones)
Change-Id: I9895b4e8f5f20b680051173995a8410f08a1f4d0
TreeHugger Robot [Tue, 28 Mar 2017 20:46:41 +0000 (20:46 +0000)]
Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:46:18 +0000 (20:46 +0000)]
Merge "Add extra flag to ApplicationInfoFlags" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:45:22 +0000 (20:45 +0000)]
Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev
Andreas Gampe [Tue, 28 Mar 2017 20:44:34 +0000 (20:44 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am:
cbcb388d82
am:
9f6dc54c29
Change-Id: Iaf7619a5161ce336316e9fcd395eabe368ad7302
Todd Kennedy [Fri, 24 Mar 2017 21:10:01 +0000 (14:10 -0700)]
Intercept direct launch of instant app installer
The instant app installer is not designed to be launched directly
by 3p apps. Instead, intercept the launch and make it look like
a "normal" instant app launch.
cherry-picked from I89c9b8c56865e260a2b92f8c2312a305a74f9cf5
Bug:
33073524
Test: Built and notice poorly behaving apps [*cough* keep *cough*] now launch instant apps
Change-Id: I5401aa8423042f54f1478409065b0d6b25cebe89
Todd Kennedy [Mon, 27 Mar 2017 23:20:37 +0000 (16:20 -0700)]
make MATCH_FACTORY_ONLY @SystemAPI
cherry-picked from I9e2046b62cb20c5b6651e91f833aff04d45d9800
Bug:
35946061
Test: None; just added an annotation
Change-Id: I604f962b9826700c335eeda9682d3354f6260c40
TreeHugger Robot [Tue, 28 Mar 2017 20:41:08 +0000 (20:41 +0000)]
Merge "Don't allow the negative height of ListPopupWindow" into oc-dev
Todd Kennedy [Mon, 27 Mar 2017 23:32:20 +0000 (16:32 -0700)]
Add extra flag to ApplicationInfoFlags
MATCH_DISABLED_COMPONENTS should be part of ApplicationInfoFlags.
cherry-picked from If6a925c156192ee4663f0cb66d82fc03a86940d6
Change-Id: I048635ff0938f2772d5702de7eb4bc4812ece605
Fixes:
34969805
Test: None; updating annotation
Andreas Gampe [Tue, 28 Mar 2017 20:38:59 +0000 (20:38 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
am:
cbcb388d82
Change-Id: I5c293bcfb026f75c15fb2fa92b2ac7f796579747
Calin Juravle [Tue, 14 Mar 2017 02:02:32 +0000 (19:02 -0700)]
Move DexLoadReporter out of LoadedApk
The DexLoadReporter was part of LoadedApk in order to lazily initialize
it when the first class loader of the app was created. However there's
no real association between the two and doing the initialization in
LoadedApk buys us nothing.
Extract the reporter in its own class and set it to BaseDexClassLoader
during bindApplication stage.
Test: boot, and check that loaded dex files are reported
Bug:
32871170
Bug:
26719109
(cherry picked from commit
37dfc8ee3ec676a0f059a9f9f1ec5d273e78a502)
Merged-In: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
Change-Id: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
# Conflicts:
# core/java/android/app/LoadedApk.java
Calin Juravle [Thu, 16 Mar 2017 01:38:57 +0000 (18:38 -0700)]
Set pm.BackgroundDexOptService as the source of true
The real dexopt maintainance job is
com.android.server.pm.BackgroundDexOptService, and not
com.android.server.BackgroundDexOptJobService
Partial revert of commit
096d304ae3d85c1bfcda1a1d9cd4eb13d0815500.
Test: manual inspection
Bug:
36140426
(partial cherry picked from commit
91d40f1baa2eeed2aa68d2492e20650d5e71dab5)
Merged-In: I983ac91117f107282095fa7eefdbce08e0dcfce3
Change-Id: I983ac91117f107282095fa7eefdbce08e0dcfce3
# Conflicts:
# core/res/AndroidManifest.xml
#
services/core/java/com/android/server/pm/PackageManagerService.java
# services/java/com/android/server/SystemServer.java
Calin Juravle [Sat, 11 Mar 2017 02:24:33 +0000 (18:24 -0800)]
Add missing return in DexManager
Harmless issue but which can spam the logs.
Test: mostly manual since the check is buried deep inside and cannot be
verified accurately. I added another test to DexManager to stress that
code path and then checked the logs.
Bug:
36117123
(cherry picked from commit
2dfc1b3e125860221bc67835c2d5c99198a12f8a)
Merged-In: I1a878a200f3f726dfaa85f1bed1398acc8dce979
Change-Id: Ib2c034add2e8229b90eb4aaa0067d42d26798670
Calin Juravle [Thu, 23 Feb 2017 03:05:06 +0000 (19:05 -0800)]
Update package use info when the app data is updated
- clear usesByOtherApps flag when the package is updated
- delete secondary dex usage data when the app data is destroyed
Test: runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
Bug:
32871170
Bug:
35381405
(cherry picked from commit
99dd37b3c5262910150ef955d16a33d32da264dd)
Merged-In: I3a249b9e8680e745fa678c7ce61b4ae764078fb9
Change-Id: Ia8416e7232cda3e42a8dccd51cb152a237e0f317
OSDN Git Service
