OSDN Git Service
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
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
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
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
Shunta Sato [Fri, 4 Nov 2016 09:57:39 +0000 (18:57 +0900)]
Don't allow the negative height of ListPopupWindow
Symptom:
If an application set a negative height to the popup list,
surfaceflinger is crashed with SIGABRT.
Root cause:
WindowManagerService dose not expect negative
height of ListPopupWindow. If it's negative,
WindowManagerService set the negative value to GraphicBufferAlloc,
but GraphicBufferAlloc handle the value as unsigned int,
then surfaceflinger is crashed with SIGABRT.
Solution:
Setting a negative height is a developer error.
We should throw an IAE from setHeigh(int).
Bug:
33441454
Author: Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com>
Change-Id: I5887674d302e567abfe66147de4819cfdf0ef97b
Chad Brubaker [Fri, 24 Mar 2017 22:53:09 +0000 (15:53 -0700)]
Add ACTION_EPHEMERAL_RESOLVER_SETTINGS
This Intent will be used in Settings to show the settings UI for the
Ephemeral resolver. Settings can get the correct component to send the
Intent to by calling
PackageManager.getInstantAppResolverSettingsComponent
Bug:
35918998
Test: Boots
Change-Id: I0edcf85704f2c19e0ee27f91b6ef057d52e32778
(cherry picked from commit
aa49cb86e6d5f23d82c97db32c848bc4ea2b81bc)
Bryce Lee [Tue, 28 Mar 2017 20:34:03 +0000 (20:34 +0000)]
Add configuration for maximum UI width.
am:
27cec32496
Change-Id: Ibb28443d72c950de06be5323b671460ad5a28041
Andreas Gampe [Tue, 28 Mar 2017 17:59:25 +0000 (10:59 -0700)]
ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.
(cherry picked from commit
62be34e32e72323e917bebb9ca39eb911e7d9371)
Bug:
33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
Treehugger Robot [Tue, 28 Mar 2017 20:28:30 +0000 (20:28 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
Jakub Pawlowski [Tue, 28 Mar 2017 20:23:49 +0000 (20:23 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am:
81cef3aeb8 am:
5cca752a4b
am:
855f9f576b
Change-Id: Icd6f6d3224c7c7fdeceb5f82f100f12e77f9c5c9
Bryce Lee [Tue, 21 Mar 2017 16:41:37 +0000 (09:41 -0700)]
Add configuration for maximum UI width.
This changelist adds config_maxUiWidth, a new system resource
configuration which specifies the maximum width the user interface
can operate in. If the physical or specified width is greater than
this value, dimensions and density are scaled down accordingly. The
native mode resolution can be still discovered through
Display.Mode#getPhysicalWidth/getPhysicalHeight.
Test: Defined override for development device and verified values.
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests#testMaxUiWidth
Change-Id: I12e7ad52f2aa8014e143bc7e80b020c9b24ed9c8
Fixes:
25820708
Jakub Pawlowski [Tue, 28 Mar 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am:
81cef3aeb8
am:
5cca752a4b
Change-Id: I8b16cad8a35aef0be8f69f7ca45d54ff08402930
Jakub Pawlowski [Tue, 28 Mar 2017 20:12:46 +0000 (20:12 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
am:
81cef3aeb8
Change-Id: Ief280cbc9283ff1cabdd3c8e53fcabd47c7881b1
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
Tianjie Xu [Tue, 28 Mar 2017 20:03:32 +0000 (20:03 +0000)]
Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18
am:
1cd3a93288
Change-Id: I341961293c992b682aea631750eb35ca7857396a
Jakub Pawlowski [Tue, 28 Mar 2017 20:01:30 +0000 (20:01 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
Tianjie Xu [Tue, 28 Mar 2017 19:53:45 +0000 (19:53 +0000)]
Merge "improve the format of locale argument when calling recovery"
am:
032c7a0a18
Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307
Tianjie Xu [Tue, 28 Mar 2017 19:42:53 +0000 (19:42 +0000)]
Merge "improve the format of locale argument when calling recovery"
Andrii Kulian [Wed, 22 Mar 2017 02:37:09 +0000 (19:37 -0700)]
Move activity to display on launch
When an activity is launched with displayId specified and there
is an existing matching task on some other display - that task
should be move to the target display.
Bug:
34396961
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMoveToDisplayOnLaunch
Change-Id: I18b1f0de320039f4f1ac4e248f048a367f886d29
(cherry picked from commit
ede131cce47a1d2ebafd25156e5caf26eb880136)
Adam Lesinski [Tue, 28 Mar 2017 19:28:11 +0000 (19:28 +0000)]
AAPT: Version <adaptive-icon> to v26
am:
cf1f1d9128
Change-Id: I7560dfdfa327677d01d28397186a7217633e34fe
Roshan Pius [Tue, 28 Mar 2017 19:17:51 +0000 (19:17 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call" into oc-dev
am:
3ab5c0173a
Change-Id: I0a904d637e18dadada262ae03f6092750869d354
Adam Lesinski [Thu, 16 Mar 2017 23:54:23 +0000 (16:54 -0700)]
AAPT: Version <adaptive-icon> to v26
Bug:
35908647
Test: manual
Change-Id: Ic8f43efe34385192fbab18675eb5898ed80912a5
Jerry Zhang [Tue, 28 Mar 2017 19:11:52 +0000 (19:11 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am:
a0360e38ab am:
cb6beee2af
am:
dbaabf762a
Change-Id: I682e7c74c5f5e48ccb3bedbf34a2bdcf85e51c30
Jerry Zhang [Tue, 28 Mar 2017 19:07:11 +0000 (19:07 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am:
a0360e38ab
am:
cb6beee2af
Change-Id: I534817c867b9dbd045a491dddcbf8190e299d972
Jerry Zhang [Tue, 28 Mar 2017 18:57:16 +0000 (18:57 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
am:
a0360e38ab
Change-Id: I862f38f52cef8b2b90125953593774263b862306
Android Build Merger (Role) [Tue, 28 Mar 2017 18:48:57 +0000 (18:48 +0000)]
Merge "Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c am:
86a70456a6 am:
46a7204472" into oc-dev-plus-aosp
Sanket Padawe [Tue, 28 Mar 2017 18:48:13 +0000 (18:48 +0000)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c am:
86a70456a6
am:
46a7204472
Change-Id: I4790952fefa3b3f3095e242f18312c2cb4ab0e74
Sanket Padawe [Tue, 28 Mar 2017 18:47:01 +0000 (18:47 +0000)]
Merge "String changes for Voice/Data/Emergency service blocked." into oc-dev
am:
d3122324a7
Change-Id: Id28b1a0209ff0918b9c1a23c5276e8d1c2b8ece2
Romain Guy [Tue, 28 Mar 2017 18:44:01 +0000 (18:44 +0000)]
Update Color API
am:
026a558ab0
Change-Id: I989e76f442dd42738c92ba4a3d4f9a9b8c738ed4
Sanket Padawe [Tue, 28 Mar 2017 18:43:51 +0000 (18:43 +0000)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
am:
86a70456a6
Change-Id: I74e9ca15db12c11b26a0923fbe2af09de0b6919b
Jerry Zhang [Tue, 28 Mar 2017 18:41:59 +0000 (18:41 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"
Conrad Chen [Mon, 27 Mar 2017 20:22:06 +0000 (13:22 -0700)]
TIF: open transient columns to public
Test: build
Bug:
36557756
Change-Id: Ieb45ee5e6bd27fb33d84799ec1510a410ff7b027
TreeHugger Robot [Tue, 28 Mar 2017 18:39:42 +0000 (18:39 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call" into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 18:39:32 +0000 (11:39 -0700)]
Correctly set thread group to UiThread's thread.
Bug:
36683525
Test: Manual (booted and launched several apps.)
Change-Id: Iff65b306e302aa2aaa2321d3faf254414f9ce1e7
Sanket Padawe [Tue, 28 Mar 2017 18:38:35 +0000 (18:38 +0000)]
Merge "String changes for Voice/Data/Emergency service blocked." into oc-dev
Andreas Gampe [Tue, 28 Mar 2017 17:59:25 +0000 (10:59 -0700)]
ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.
Bug:
33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
Sanket Padawe [Mon, 27 Mar 2017 23:43:25 +0000 (16:43 -0700)]
String changes for Voice/Data/Emergency service blocked.
Bug:
31490566
Change-Id: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
(cherry picked from commit
acc0a4481ce83489c05af1d70e66362eaf7f04a1)
Merged-in: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
Romain Guy [Wed, 22 Mar 2017 18:08:37 +0000 (11:08 -0700)]
Update Color API
Make the class final because its instances are immutable and
it contained only static methods prior to O. Fix a couple of
typos/issues reported by external developers. Add a new variant
of getComponents() to avoid allocations, as requested by
external dev.
Test: Color_ColorLongTest
Bug:
32984164
Change-Id: I3c22e124c9fdf66142d530afa4beb05fe0669359
(cherry picked from commit
48f38f18385e8aed0df48524d8ea3d20eba9199f)
Sanket Padawe [Tue, 28 Mar 2017 18:30:44 +0000 (11:30 -0700)]
Merge commit '
999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c
Change-Id: Ic55532c0d8962288346d2c9b067794d7f5c157f3
Dongwon Kang [Tue, 28 Mar 2017 18:30:06 +0000 (18:30 +0000)]
Merge "MediaSession: clear identity before accessing service methods" into oc-dev
am:
78f5c26fa6
Change-Id: I69e4a7c1a21fae45cbc1d192ca1d3d0a5beb37b0
Jason Monk [Tue, 28 Mar 2017 18:24:23 +0000 (18:24 +0000)]
Merge "QS: Don't animate first state change" into oc-dev
am:
462eeda68d
Change-Id: I73ff4ac6f2c79a23e4b8c57037927e2a811d0db5
Amith Yamasani [Tue, 28 Mar 2017 18:23:19 +0000 (18:23 +0000)]
Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev
am:
fbd2c21f18
Change-Id: I228f8389c0459c6b1a3e7a211aae2ce4cbd9014a
Jason Monk [Tue, 28 Mar 2017 18:22:14 +0000 (18:22 +0000)]
Fix QS getting stuck in weird animation during recreate
am:
da9395e681
Change-Id: I1ed3bb49bfcce542fede1eb679c68a36b316e00b
Dongwon Kang [Tue, 28 Mar 2017 18:20:24 +0000 (18:20 +0000)]
Merge "MediaSession: clear identity before accessing service methods" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 18:16:55 +0000 (18:16 +0000)]
Merge "QS: Don't animate first state change" into oc-dev
Dongwon Kang [Tue, 28 Mar 2017 17:54:46 +0000 (10:54 -0700)]
MediaSession: clear identity before accessing service methods
Test: build and manually verified the issue is fixed.
Bug:
36669550
Change-Id: I44eda4e2fb08dd9aa6972b12ed4c4e82797ff587
OSDN Git Service
