OSDN Git Service
Doris Ling [Wed, 29 Mar 2017 17:46:29 +0000 (17:46 +0000)]
Merge "Reserve space for preference icon." into oc-dev am:
ddb280b1ac
am:
21bb27f716
Change-Id: I8dc434a901a2c4cb75a12dd79dd7f55cbba1ae35
Etan Cohen [Wed, 29 Mar 2017 17:45:04 +0000 (17:45 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev am:
6fd057cf58 -s ours
am:
bf0022d192 -s ours
Change-Id: I8e4751dc0b3696d5755814389abb0dfded3bb042
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:24:53 +0000 (17:24 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d am:
9bc8e05da2 am:
342a27e7f7
am:
b36a9e0eb5
Change-Id: I0c4f93b03a73e169da7250b1cf7e5cc1269d4f07
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"
Evan Rosky [Wed, 29 Mar 2017 17:02:13 +0000 (17:02 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus"
TreeHugger Robot [Wed, 29 Mar 2017 16:59:44 +0000 (16:59 +0000)]
Merge "AOD: Use DOZE_SUSPEND screenstate when supported"
Rob Carr [Wed, 29 Mar 2017 16:57:55 +0000 (16:57 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev am:
76d779374a
am:
450ae4a114
Change-Id: Idfe9a9fa4b376b3754eabb0898b1639bc2ebf900
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
Geoffrey Pitsch [Wed, 29 Mar 2017 16:45:54 +0000 (16:45 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev am:
1af2928767
am:
30d90c8fc0
Change-Id: I5ba3d347e1a385e85cd047695acc377248f3ab6b
Rob Carr [Wed, 29 Mar 2017 16:44:36 +0000 (16:44 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
Diego Perez [Wed, 29 Mar 2017 16:21:38 +0000 (16:21 +0000)]
Merge "Add kotlinc.xml to gitignore"
Philip P. Moltmann [Wed, 29 Mar 2017 16:12:41 +0000 (16:12 +0000)]
Merge "Do not allow printing until preview is updated"
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
TreeHugger Robot [Wed, 29 Mar 2017 15:22:40 +0000 (15:22 +0000)]
Merge "Fix warnings in Bridge"
Etan Cohen [Wed, 29 Mar 2017 15:18:34 +0000 (15:18 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b am:
c24d7f781a am:
7060ae081b
am:
b51c04effb
Change-Id: I83df0d4bf3368075d46e6fe439d58491c8812cdb
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:47:22 +0000 (14:47 +0100)]
Add kotlinc.xml to gitignore
Test: N/A
Change-Id: Id9b6b81b113a253b843281bbf1240006183e592e
Diego Perez [Mon, 27 Mar 2017 15:46:35 +0000 (16:46 +0100)]
Fix warnings in Bridge
Test: N/A
Change-Id: I7ce6c1d78ad02c410eb3c01f29f95aaf9e2417e4
Diego Perez [Wed, 29 Mar 2017 13:35:49 +0000 (13:35 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev am:
92b3242827
am:
c95297654f
Change-Id: Ic9359116c9746565fdecf8b542b22647ea1044b8
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
TreeHugger Robot [Wed, 29 Mar 2017 13:19:03 +0000 (13:19 +0000)]
Merge "Fix fonts following
455f1bfc05"
Tony Mak [Wed, 29 Mar 2017 12:18:43 +0000 (12:18 +0000)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue am:
ec319aba34
am:
98f50894bc
Change-Id: I4e8d08e603dc86c631d5055ad51ffe31a9442ad5
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:29:58 +0000 (12:29 +0100)]
Fix fonts following
455f1bfc05
Test: Fixes broken tests
Change-Id: I62d001c6d0ed84fe1d1d9865b1027be0e1cad8b4
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:55:39 +0000 (04:55 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev am:
76c32a35a9
am:
dfc108a660
Change-Id: I97edd763bac786148a3243ed1e5174d85d49327d
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:48:57 +0000 (04:48 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev am:
3938580b86
am:
f73d8010b9
Change-Id: Icc4aa979cdc2f9cfb17333d10239154495af2a63
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:55:51 +0000 (01:55 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods" am:
79a973f643
am:
fb01ea4c11
Change-Id: I6058093e24a9a5376b7ab542df8f1f43ec5b38e9
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:40:09 +0000 (01:40 +0000)]
Merge changes from topic 'dex' am:
f665781c74 am:
8a4afd3dad am:
5949d0dcdc -s ours
am:
455379b70a -s ours
Change-Id: I7a512ea55d4c88e71037d7b8c3c3d9205d5f285f
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
Maurice Lam [Wed, 29 Mar 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Add exclusive attribute to suggestion category"
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
Casey Burkhardt [Wed, 29 Mar 2017 01:17:59 +0000 (01:17 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev am:
684607f7f6
am:
66ebc6ad2c
Change-Id: I3512d87717f91e89f6fdb269c15d934c78337a3b
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
Android Build Merger (Role) [Wed, 29 Mar 2017 00:59:46 +0000 (00:59 +0000)]
Merge "Merge "TIF: open transient columns to public" into oc-dev am:
438be2af18 am:
edafff3ed0"
Conrad Chen [Wed, 29 Mar 2017 00:59:02 +0000 (00:59 +0000)]
Merge "TIF: open transient columns to public" into oc-dev am:
438be2af18
am:
edafff3ed0
Change-Id: Ib3c60be6635cc5be95f7a1322a6c0d8fb79a6723
Phil Weaver [Wed, 29 Mar 2017 00:58:27 +0000 (00:58 +0000)]
Merge "Fix problem with ListView accessibility focus"
Yifan Hong [Wed, 29 Mar 2017 00:53:34 +0000 (00:53 +0000)]
Merge "Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da am:
75172f2909 am:
2b38993bef" into oc-dev-plus-aosp
am:
06898dff6a
Change-Id: I7d9b2c26c85403b9df476f9eb437393a6058b687
Ammar Aijazi [Wed, 29 Mar 2017 00:52:14 +0000 (00:52 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev am:
334220984e
am:
7b7c8f23d2
Change-Id: I6eea29b4b18f1ed53de557c79a81f9fc59770f50
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:39:20 +0000 (00:39 +0000)]
Merge "Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288 am:
bc0865bc78" into oc-dev am:
b25b2f2dab
am:
f75b358dd2
Change-Id: Iedb7eabb26ce24d7a706cc2db732ebba91132288
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)
Adrian Roos [Tue, 28 Mar 2017 23:20:34 +0000 (16:20 -0700)]
AOD: Use DOZE_SUSPEND screenstate when supported
Bug:
30876804
Bug:
33175018
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapterTest.java
Change-Id: If4d0cadced1f0ac3e737d78759820858b70081e6
Winson Chung [Wed, 29 Mar 2017 00:04:28 +0000 (00:04 +0000)]
Merge "Prevent invisible PiP menu activity from having touch focus."
George Mount [Tue, 28 Mar 2017 23:55:30 +0000 (23:55 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev am:
c8d8c27c68
am:
abea405064
Change-Id: Ib8bf2e7e6e0403f17c7f58f31a26554ca74f3272
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
TreeHugger Robot [Tue, 28 Mar 2017 23:36:11 +0000 (23:36 +0000)]
Merge "Fix a bug with filtering by raw bytes when such filter is not provided"
Andreas Gampe [Tue, 28 Mar 2017 23:28:23 +0000 (23:28 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev am:
f7d650e89a
am:
d51261a089
Change-Id: I5f140507bcb25a87550249898cc7a43417201076
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:11:05 +0000 (23:11 +0000)]
Merge "Move activity to display on launch" into oc-dev am:
5c5bf24033
am:
33d986d915
Change-Id: Iae0fabc3d580f77799c61966d4e2f48bda5d4bd2
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
Brad Ebinger [Tue, 28 Mar 2017 22:49:26 +0000 (22:49 +0000)]
Merge "Remove non-localized message" am:
ddbd256954 am:
70a09c00e5 am:
9c7b7f0de7
am:
ae8a95883b
Change-Id: I0c6e2d7fde58b37bd80f376ef990e9e046bacd72
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
Makoto Onuki [Tue, 28 Mar 2017 22:35:58 +0000 (22:35 +0000)]
Merge "Correctly set thread group to UiThread's thread." into oc-dev am:
479bb430d1
am:
1d209ebcad
Change-Id: If23d7726075d98f60d4743179f2ecb52b3775f8d
Brad Ebinger [Tue, 28 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Remove non-localized message"
am:
ddbd256954
Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
OSDN Git Service
