OSDN Git Service
Jason Chiu [Tue, 29 Oct 2019 09:06:28 +0000 (17:06 +0800)]
Fix Settings creating too many threads unexpectedly
Provide a method to submit a Callable for execution in the shared
background thread pool.
Bug:
143434413
Test: manual, robotest
Change-Id: I149b5926f20acd0e43c4071cc35520c6bc50efef
Keun-young Park [Wed, 30 Oct 2019 02:56:54 +0000 (02:56 +0000)]
Merge "Migrate car sysui to use new createCar call and prevent crash"
Xiangyu/Malcolm Chen [Wed, 30 Oct 2019 02:51:08 +0000 (19:51 -0700)]
[automerger skipped] Merge "Have getSupportedModemCount always rely on system properties." am:
d7f38d742b am:
10cf5939c6
am:
9d813b92f8 -s ours
am skip reason: change_id I34e172c747dd52aa498037e64b758393793fddba with SHA1
a416d984b0 is in history
Change-Id: I670f965636e67abe0ae2a4f2bb23b860ba72c8fb
TreeHugger Robot [Wed, 30 Oct 2019 02:46:42 +0000 (02:46 +0000)]
Merge "Don't dump SysUI config if other args are provided"
Xiangyu/Malcolm Chen [Wed, 30 Oct 2019 02:38:56 +0000 (19:38 -0700)]
Merge "Have getSupportedModemCount always rely on system properties." am:
d7f38d742b
am:
10cf5939c6
Change-Id: I3220634cf014483d8bfbfbf38f628fc22a9a952d
Xiangyu/Malcolm Chen [Wed, 30 Oct 2019 02:26:20 +0000 (19:26 -0700)]
Merge "Have getSupportedModemCount always rely on system properties."
am:
d7f38d742b
Change-Id: I338e12b9810d5cb4f2af188ab6f3652a2a104f83
Philip P. Moltmann [Wed, 30 Oct 2019 02:21:51 +0000 (02:21 +0000)]
Merge "Note with featureId from ContentProvider"
Xiangyu/Malcolm Chen [Wed, 30 Oct 2019 02:10:42 +0000 (02:10 +0000)]
Merge "Have getSupportedModemCount always rely on system properties."
TreeHugger Robot [Wed, 30 Oct 2019 02:06:59 +0000 (02:06 +0000)]
Merge "Add frontend constants and callback"
Chen Xu [Wed, 30 Oct 2019 01:12:45 +0000 (01:12 +0000)]
Merge "cellbroadcast provider refactor"
Ruijie Bai [Wed, 30 Oct 2019 01:08:05 +0000 (18:08 -0700)]
Merge "Returns null not empty string if MEID is not available" am:
634c108060 am:
02445f14da
am:
7a318f0646
Change-Id: I41b8c9de8c7bd0c2a93c9f8444e77af84c50c293
Ruijie Bai [Wed, 30 Oct 2019 00:57:11 +0000 (17:57 -0700)]
Merge "Returns null not empty string if MEID is not available" am:
634c108060
am:
02445f14da
Change-Id: Iad4251e00f28f1e051bc6af79cbdb3179230442d
Hideki Ishii [Wed, 30 Oct 2019 00:55:55 +0000 (17:55 -0700)]
Merge "Prevent sending CLIR activation and deactivation code only" am:
5cd5e277dc am:
29ef902835
am:
432cf72f81
Change-Id: Ide5292389c2e91c8a7ce71e655ceec92a640cbf9
Ruijie Bai [Wed, 30 Oct 2019 00:45:25 +0000 (17:45 -0700)]
Merge "Returns null not empty string if MEID is not available"
am:
634c108060
Change-Id: I75230fdc0f1014f5fc5d3e986c951bf5ece4d545
Hideki Ishii [Wed, 30 Oct 2019 00:43:58 +0000 (17:43 -0700)]
Merge "Prevent sending CLIR activation and deactivation code only" am:
5cd5e277dc
am:
29ef902835
Change-Id: I9962a7b127cd32a3541eafc5447a2dd6a8511717
Hideki Ishii [Wed, 30 Oct 2019 00:32:11 +0000 (17:32 -0700)]
Merge "Prevent sending CLIR activation and deactivation code only"
am:
5cd5e277dc
Change-Id: I5345550ba9c58a699c7b36de51874adab73d4aeb
TreeHugger Robot [Wed, 30 Oct 2019 00:32:02 +0000 (00:32 +0000)]
Merge "Remove a dead option"
Steven Liu [Wed, 30 Oct 2019 00:28:52 +0000 (00:28 +0000)]
Merge "Add carrier ID field for WifiConfiguration and PasspointConfiguration"
Ned Burns [Wed, 30 Oct 2019 00:27:07 +0000 (20:27 -0400)]
Don't dump SysUI config if other args are provided
This was polluting the output of selective dump from
adb shell dumpsys activity service com.android.systemui/.SystemUIService dependency DumpController <tag>
Test: manual
Change-Id: Ifcfb97e3edf2005e16a1433862fe9094927c0761
Treehugger Robot [Wed, 30 Oct 2019 00:21:50 +0000 (00:21 +0000)]
Merge "Returns null not empty string if MEID is not available"
Treehugger Robot [Wed, 30 Oct 2019 00:08:27 +0000 (00:08 +0000)]
Merge "Prevent sending CLIR activation and deactivation code only"
TreeHugger Robot [Tue, 29 Oct 2019 23:51:56 +0000 (23:51 +0000)]
Merge "Remove StartInputFlags.FIRST_WINDOW_FOCUS_GAIN"
Soonil Nagarkar [Tue, 29 Oct 2019 23:42:25 +0000 (23:42 +0000)]
Merge "Fix remaining Handler mismatch"
Xiangyu/Malcolm Chen [Tue, 29 Oct 2019 23:35:22 +0000 (16:35 -0700)]
[automerger skipped] Merge changes from topic "am-
499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp
am:
78a2b61782 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1
387dc0efd1 is in history
Change-Id: I66e67c4a085300d2fea3e58e6c45dbd1a4864189
Xiangyu/Malcolm Chen [Tue, 29 Oct 2019 23:25:01 +0000 (16:25 -0700)]
[automerger skipped] Merge changes from topic "getDeviceCapableModemCount" am:
8ed3fb4bcf am:
dd9d9fde68
am:
9ed67f1ba6 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1
32f799da52 is in history
Change-Id: I3e0d043ac5dd0f2656227d85fe22c80c20505a00
Lucas Dupin [Tue, 29 Oct 2019 23:22:49 +0000 (16:22 -0700)]
Merge "Fix clock alpha when awake" into qt-qpr1-dev am:
5a7e009b8c
am:
95caf3907b
Change-Id: Ibb03a7dae910312bb29c9fede8a418dfa108cc45
Android Build Merger (Role) [Tue, 29 Oct 2019 23:17:50 +0000 (23:17 +0000)]
Merge changes from topic "am-
499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp
* changes:
Merge changes from topic "getDeviceCapableModemCount" am:
8ed3fb4bcf am:
dd9d9fde68
Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am:
64ff73fe4d am:
23aaf352ea
Xiangyu/Malcolm Chen [Tue, 29 Oct 2019 23:15:58 +0000 (16:15 -0700)]
Merge changes from topic "getDeviceCapableModemCount" am:
8ed3fb4bcf
am:
dd9d9fde68
Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b
Malcolm Chen [Tue, 29 Oct 2019 23:15:48 +0000 (16:15 -0700)]
Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am:
64ff73fe4d
am:
23aaf352ea
Change-Id: I37561f740c57b60285d184e0882c95648c81d220
Lucas Dupin [Tue, 29 Oct 2019 23:15:23 +0000 (16:15 -0700)]
Merge "Fix clock alpha when awake" into qt-qpr1-dev
am:
5a7e009b8c
Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06
Xiangyu/Malcolm Chen [Tue, 29 Oct 2019 23:09:15 +0000 (16:09 -0700)]
Merge changes from topic "getDeviceCapableModemCount"
am:
8ed3fb4bcf
Change-Id: I092ecb302852b4814fcef58084764e84bede154e
Malcolm Chen [Tue, 29 Oct 2019 23:09:01 +0000 (16:09 -0700)]
Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
am:
64ff73fe4d
Change-Id: I94a1b7159ef656f2be20d6ecc1d0548479f0672a
Nick Chalko [Tue, 29 Oct 2019 23:04:48 +0000 (16:04 -0700)]
Merge "Add OWNERS for media/tv files" am:
c91c7ab339 am:
a0f0da0bd1
am:
3a6f4226ca
Change-Id: Iefcca06ab0103f2d92b9564cd56fc819b617aec3
Jing Ji [Tue, 29 Oct 2019 23:02:11 +0000 (23:02 +0000)]
Merge "Add test case for racing between process's death and service's stop"
Christian Wailes [Tue, 29 Oct 2019 23:01:25 +0000 (16:01 -0700)]
[automerger skipped] Merge "Fixes a system crash in VibratorService on x86 hosts" am:
5ed0e55859 am:
5d8f3ae57d
am:
01676b2564 -s ours
am skip reason: change_id If50f68df9579f84bddc9d70a0a30cd73f4485e96 with SHA1
e2e5a31362 is in history
Change-Id: I8de0517621facad6f880685b67979d235a3fc815
Xiangyu/Malcolm Chen [Tue, 29 Oct 2019 22:54:26 +0000 (22:54 +0000)]
Merge changes from topic "getDeviceCapableModemCount"
* changes:
Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
TreeHugger Robot [Tue, 29 Oct 2019 22:53:59 +0000 (22:53 +0000)]
Merge "Data/activation broadcasts use elapsed realtime"
Lucas Dupin [Tue, 29 Oct 2019 22:53:39 +0000 (22:53 +0000)]
Merge "Fix clock alpha when awake" into qt-qpr1-dev
Jack Yu [Tue, 29 Oct 2019 22:53:17 +0000 (15:53 -0700)]
Merge "Addition of 'XorEqualsString' method for comparing String" am:
e750b5b659 am:
000baa69f6
am:
cbebaf2eb9
Change-Id: Id8b139aec8fb3e3bfc1db2fd304647264ba2a947
Nick Chalko [Tue, 29 Oct 2019 22:52:55 +0000 (15:52 -0700)]
Merge "Add OWNERS for media/tv files" am:
c91c7ab339
am:
a0f0da0bd1
Change-Id: I75dbf8c9ecd9827b216933af11acef856cd3a6aa
Paul Duffin [Tue, 29 Oct 2019 22:49:34 +0000 (15:49 -0700)]
Merge "Ignore classes on the classpath when generating stubs" am:
c817b66016 am:
275d3b5585
am:
2b0d8181b0
Change-Id: Ib4ea2b2bf97c4328006922dd850d07abecadeebf
Christian Wailes [Tue, 29 Oct 2019 22:49:04 +0000 (15:49 -0700)]
Merge "Fixes a system crash in VibratorService on x86 hosts" am:
5ed0e55859
am:
5d8f3ae57d
Change-Id: Ic699d40f08f65c5b0731dfc75c13f42cd8b3c66a
TreeHugger Robot [Tue, 29 Oct 2019 22:44:56 +0000 (22:44 +0000)]
Merge "[wm]: Fixed layout problem in PolicyControl immersive mode"
Philip P. Moltmann [Fri, 27 Sep 2019 15:44:12 +0000 (08:44 -0700)]
Note with featureId from ContentProvider
This takes the Context#getFeatureId from the calling context and pipes
it all way through to the noteOp calls done by the content provider.
Bug:
136595429
Test: atest CtsAppOpsTestCases (new test added to capture this case)
TelecomUnitTests:CallLogManagerTest
ContentProviderClientTest
TelecomUnitTests:MissedCallNotifierImplTest
TelecomUnitTests:BasicCallTests
MediaInserterTest
PreferencesHelperTest
RankingHelperTest
PinnedSliceStateTest
FrameworksCoreTests:ContentResolverTest
Change-Id: I53b1035626229c920b353509a5bece157b52fb51
Jack Yu [Tue, 29 Oct 2019 22:40:32 +0000 (15:40 -0700)]
Merge "Addition of 'XorEqualsString' method for comparing String" am:
e750b5b659
am:
000baa69f6
Change-Id: I1f85966f9a430e78e784b527771f4b5ce80e5289
Nick Chalko [Tue, 29 Oct 2019 22:39:50 +0000 (15:39 -0700)]
Merge "Add OWNERS for media/tv files"
am:
c91c7ab339
Change-Id: Ibe22561aca8dc5c2f0c21c843607ffd5c6b1cbfb
Christian Wailes [Tue, 29 Oct 2019 22:35:54 +0000 (15:35 -0700)]
Merge "Fixes a system crash in VibratorService on x86 hosts"
am:
5ed0e55859
Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388
Paul Duffin [Tue, 29 Oct 2019 22:35:40 +0000 (15:35 -0700)]
Merge "Ignore classes on the classpath when generating stubs" am:
c817b66016
am:
275d3b5585
Change-Id: Iae5798157a855f3a7b3e699ccc2cb0b52d80641e
TreeHugger Robot [Tue, 29 Oct 2019 22:34:34 +0000 (22:34 +0000)]
Merge "DisplayTransformManager: use a single SurfaceFlinger handle"
Treehugger Robot [Tue, 29 Oct 2019 22:31:08 +0000 (22:31 +0000)]
Merge "Add OWNERS for media/tv files"
Jack Yu [Tue, 29 Oct 2019 22:28:36 +0000 (15:28 -0700)]
Merge "Addition of 'XorEqualsString' method for comparing String"
am:
e750b5b659
Change-Id: Ia9bd50755df21d39ca9b3e2ef955f9a774a994ed
Jian-Yang Liu [Tue, 29 Oct 2019 22:28:23 +0000 (15:28 -0700)]
[automerger skipped] Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev am:
90572cb3c6
am:
63150de91d -s ours
am skip reason: change_id Ia0b6a56859889d538e21f807a88bc5217d89e64a with SHA1
cf7b336020 is in history
Change-Id: I993b5534a72d78070797aa1aedac27aa685e6190
Paul Duffin [Tue, 29 Oct 2019 22:23:17 +0000 (15:23 -0700)]
Merge "Ignore classes on the classpath when generating stubs"
am:
c817b66016
Change-Id: Ia9068a94de9f50cbd387f016da301dd4db0780b1
Jian-Yang Liu [Tue, 29 Oct 2019 22:21:19 +0000 (15:21 -0700)]
Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev
am:
90572cb3c6
Change-Id: I42794c749e67a0fb1a8702dab4e852e9eca27922
Christian Wailes [Tue, 29 Oct 2019 22:13:06 +0000 (22:13 +0000)]
Merge "Fixes a system crash in VibratorService on x86 hosts"
Jian-Yang Liu [Tue, 29 Oct 2019 22:02:15 +0000 (22:02 +0000)]
Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev
Steven Liu [Mon, 19 Aug 2019 21:28:03 +0000 (14:28 -0700)]
Add carrier ID field for WifiConfiguration and PasspointConfiguration
This is only for the load and save Carrier ID field.
Bug:
130875004
Test: build, bootup, unit test
Change-Id: Id48587ca26fc9dc0f7678b5a449e2d39a2e90dae
TreeHugger Robot [Tue, 29 Oct 2019 21:33:21 +0000 (21:33 +0000)]
Merge "NotifMediaManager looks at pending + active notifs"
Tej Singh [Wed, 23 Oct 2019 22:53:46 +0000 (15:53 -0700)]
Data/activation broadcasts use elapsed realtime
The data and activation broadcasts were guardrailed using
elapsedRealtime of the *LogEvent*. However, it's possible to use
incorrect timestamps, and it's also possible that we could process
events that are old, which would result in the broadcast getting sent
too frequently. To fix this, we should use the current elapsedRealtime
instead of the LogEvent's elapsedRealtime.
I can remove the config activation broadcast if we think we should hold
off on it.
Test: bit statsd_test:*
Bug:
143155387
Change-Id: I4c58d2558d6ba3b4fd15a4a619d6f80a7bd7113f
Jack Yu [Tue, 29 Oct 2019 21:12:26 +0000 (21:12 +0000)]
Merge "Addition of 'XorEqualsString' method for comparing String"
Treehugger Robot [Tue, 29 Oct 2019 21:09:29 +0000 (21:09 +0000)]
Merge "Ignore classes on the classpath when generating stubs"
Anthony Hugh [Tue, 29 Oct 2019 21:08:08 +0000 (21:08 +0000)]
Merge "Update getUserSwitchability() to handle different user ids and Auto"
Michele [Tue, 29 Oct 2019 20:42:23 +0000 (13:42 -0700)]
[automerger skipped] Merge "Expose APIs required by CarrierDefaultApp as system APIs." am:
8c6e9e653d am:
d9cb5b9427 am:
03b6954f5b
am:
01f3aa4fff -s ours
am skip reason: change_id I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee with SHA1
61f098ecaf is in history
Change-Id: Ia293151feff2d0fa112867d30a818bf475a991e7
Michele [Tue, 29 Oct 2019 20:35:53 +0000 (13:35 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs." am:
8c6e9e653d am:
d9cb5b9427
am:
03b6954f5b
Change-Id: Iff7b36a5b35766788c1f8cf7e015646804c19fc3
Michele [Tue, 29 Oct 2019 20:28:53 +0000 (13:28 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs." am:
8c6e9e653d
am:
d9cb5b9427
Change-Id: Iad08bbff172267a64d5d2b18050f2d23f4f1a60e
Michele [Tue, 29 Oct 2019 20:22:50 +0000 (13:22 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs."
am:
8c6e9e653d
Change-Id: I53e5b94caa0c9e7388cb23f6b3f21c134d79d43c
Chris Wailes [Fri, 25 Oct 2019 20:44:53 +0000 (13:44 -0700)]
Fixes a system crash in VibratorService on x86 hosts
Original symptom: Cuttlefish devices would crash when the "recent apps"
tray was swiped up from the bottom.
Root cause: Raising the "recent apps" tray triggers a vibration. Close
to the bottom of the call stack responsible for this action in
VibratorService is the native function vibratorPerformEffect(). The
Java Language signature for this function has a long as the type of the
second parameter, as does the JNI signature that is registered with the
environment. The native function, however, uses an int type for this
parameter. As a result, when the arguments are passed via the stack on
x86 devices the high bits of the second long argument are read as the
contents of the third argument, which is a jobject reference. When the
code attempts to convert this NULL local reference into a global
reference the JNI code aborts the runtime for the process. Because the
VibratorService is part of the SystemServer, when it crashes the Zygote
is notified and restarts the entire shell.
Why this wasn't an issue on ARM devices: ARMs calling conventions pass
many of a function's arguments via registers instead of via the stack.
This means that the long argument is passed in a register, preventing it
from stomping on any other arguments. When the native function uses the
argument it simply reads the lower bits from the register and ignores
the higher bits.
Why this wasn't previously an issue on X86 hosts: ag/
9158254 introduced
a new parameter to the vibratorPerformEffect() function. This new
parameter is located after the mis-typed parameter and will be aliased
to the high bits of the mis-typed long argument.
Fix: Correct the type signature of the native vibratorPerformEffect()
function.
Bug:
143082450
Test: Build -> start cuttlefish -> raise recent apps tray -> no crash
[adelva: port to AOSP to close potential ASAN issues]
Change-Id: If50f68df9579f84bddc9d70a0a30cd73f4485e96
Merged-In: If50f68df9579f84bddc9d70a0a30cd73f4485e96
JianYang Liu [Fri, 25 Oct 2019 00:19:44 +0000 (17:19 -0700)]
Changed Notification shade's background alpha initial and final values
to be configurable.
Bug:
143372960
Test: manual - took before and after videos
Merged-In: Ia0b6a56859889d538e21f807a88bc5217d89e64a
Change-Id: Ia0b6a56859889d538e21f807a88bc5217d89e64a
Treehugger Robot [Tue, 29 Oct 2019 20:06:27 +0000 (20:06 +0000)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs."
TreeHugger Robot [Tue, 29 Oct 2019 20:02:43 +0000 (20:02 +0000)]
Merge "Fixes a system crash in VibratorService on x86 hosts"
Oscar Shu [Tue, 29 Oct 2019 19:54:58 +0000 (19:54 +0000)]
Merge "[MAC rand] Repurpose existing field"
TreeHugger Robot [Tue, 29 Oct 2019 19:54:45 +0000 (19:54 +0000)]
Merge "Make AFont_getLocale work"
Seigo Nonaka [Fri, 25 Oct 2019 01:50:51 +0000 (18:50 -0700)]
Make AFont_getLocale work
There are multiple problems here:
- Java Font.equals and hashCode doesn't look at locale list. Due to this
issue, the CTS tests have been passing unexpectedly.
- The null pointer check in the AFont_getLoacle was inversed. Should
return only when it is non-null.
- Looks like we cannot get the parent's attribute which always returns
null. Instead, read the "lang" attribute when we read the family tag.
Bug:
139201432
Test: atest NativeSystemFontTest
Test: atest TypefaceEqualsTest
Change-Id: I0514847bbf46a73358afab374ccfce2db09b2ec0
TreeHugger Robot [Tue, 29 Oct 2019 19:51:39 +0000 (19:51 +0000)]
Merge "Revert "Get compatibility immediately on initialization""
Heemin Seog [Tue, 29 Oct 2019 19:48:42 +0000 (19:48 +0000)]
Merge changes I0a54ddf3,I10fd4e2e
* changes:
Remove references to nav bar views in StatusBar
Setup on device testing for sys ui
TreeHugger Robot [Tue, 29 Oct 2019 19:43:39 +0000 (19:43 +0000)]
Merge "Clean up logic around user icons"
Jing Ji [Fri, 18 Oct 2019 18:33:24 +0000 (11:33 -0700)]
Add test case for racing between process's death and service's stop
Bug:
136627142
Test: atest -c \
FrameworksServicesTests:ActivityManagerTest#testServiceUnbindAndKilling
Change-Id: I47f6bc5f384379c8e34b67ff42a4916c26ba00cc
Beverly [Wed, 23 Oct 2019 21:56:48 +0000 (17:56 -0400)]
NotifMediaManager looks at pending + active notifs
So it doesn't care whether the notifications are
inflated or not yet
Test: atest SystemUiTests
Change-Id: Ida77098cf5a760e9ac578271c387bbf345c3c887
Malcolm Chen [Sat, 19 Oct 2019 00:05:16 +0000 (17:05 -0700)]
Have getSupportedModemCount always rely on system properties.
Earlier we disabled the reboot free feature and always have
getSupportedModemCount return the same value with getActiveModemCount.
Now that we've enbaled reboot free switch, we will return correct value
based on system property.
Bug:
142514392
Test: manual - change PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and test
what getSupportedModemCount returns.
Change-Id: I34e172c747dd52aa498037e64b758393793fddba
Merged-In: I34e172c747dd52aa498037e64b758393793fddba
Malcolm Chen [Wed, 9 Oct 2019 01:11:22 +0000 (18:11 -0700)]
Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.
Bug:
141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
Merged-In: If086c50ae803b384691f709057bceeac2fc1d9d5
Malcolm Chen [Wed, 2 Oct 2019 02:44:06 +0000 (19:44 -0700)]
Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
ACTION_MULTI_SIM_CONFIG_CHANGED will be sent when multi-SIM
variants change.
Bug:
141388730
Test: test app
Change-Id: I717482ea05571afdfe6b04318d3f1fbda0c177ed
Merged-In: I717482ea05571afdfe6b04318d3f1fbda0c177ed
Soonil Nagarkar [Tue, 29 Oct 2019 19:12:08 +0000 (12:12 -0700)]
Fix remaining Handler mismatch
Use direct executor for backwards compatibility when
addGpsStatusListener is invoked not on a handler.
Bug:
143544726
Test: manual
Change-Id: I594e302962737154e29d8226d0c19dbdebd18cbb
Nathan Harold [Tue, 29 Oct 2019 18:58:48 +0000 (11:58 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev am:
766c011ff0 -s ours
am:
c92a649723 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib8394fbffe4e09b6166ec0b6c03fdcdf6df6e9fe
Nathan Harold [Tue, 29 Oct 2019 18:46:51 +0000 (11:46 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev
am:
766c011ff0 -s ours
am skip reason: change_id I1307d1d7aacef0bbd33bfc73700ee774e12e64c1 with SHA1
fff052067c is in history
Change-Id: I13827dfef005720035ae9ea58c82bfc55e905100
TreeHugger Robot [Tue, 29 Oct 2019 18:20:46 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Nathan Harold [Tue, 29 Oct 2019 18:20:19 +0000 (18:20 +0000)]
Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev
Jean-Michel Trivi [Tue, 29 Oct 2019 18:18:20 +0000 (18:18 +0000)]
Merge "Revert "AudioService: simplify/document locking""
TreeHugger Robot [Tue, 29 Oct 2019 18:04:53 +0000 (18:04 +0000)]
Merge "Fix mistake in SurfaceView lifetime refactoring."
Heemin Seog [Fri, 25 Oct 2019 21:34:11 +0000 (14:34 -0700)]
Remove references to nav bar views in StatusBar
All relevant logic is in the CarNavigationBarController which means we
don't need to account for the views in two different parts of SystemUI.
Bug:
143143539
Test: atest CarNavigationBarControllerTest
Change-Id: I0a54ddf3966a8e373909062df78ec2665f4a9c9d
Heemin Seog [Wed, 23 Oct 2019 23:52:31 +0000 (16:52 -0700)]
Setup on device testing for sys ui
This borrows on the testing infrastructure set up by the phone sys ui
team and provides an examples via test for CarNavigationBarController.
Bug:
143227120
Test: atest CarNavigationBarControllerTest
Change-Id: I10fd4e2e51f2faf75ade5b40e47441a9e948f075
TreeHugger Robot [Tue, 29 Oct 2019 17:49:34 +0000 (17:49 +0000)]
Merge "Add TEST_MAPPING for UsageStats."
Anna Trostanetski [Tue, 29 Oct 2019 16:44:25 +0000 (16:44 +0000)]
Revert "Get compatibility immediately on initialization"
This reverts commit
5127b31dc13cdadfd404ddd26c01906c773efab9.
Reason for revert: It doesn't fix the bug, and uses CompatConfig that shouldn't be exposed
Test: locally
Bug:
142281062
Change-Id: I60e21d19e20b7926d270d8f6870e8969d96fa8a2
Jian-Yang Liu [Tue, 29 Oct 2019 16:49:51 +0000 (16:49 +0000)]
Merge "Changed Notification shade's background alpha initial and final values to be configurable."
Steven Moreland [Tue, 29 Oct 2019 16:47:16 +0000 (09:47 -0700)]
Merge "ServiceManagerProxy: implement new method" am:
2a6f6ed94b am:
9ab8a0713f am:
1574e4fd4e
am:
156230b3bf
Change-Id: Id21faff58a559d052dfc6da049f6cd445964852d
TreeHugger Robot [Tue, 29 Oct 2019 16:43:38 +0000 (16:43 +0000)]
Merge "Separate adapter logic from ChooserActivity and ResolverActivity"
Nicolas Geoffray [Tue, 29 Oct 2019 16:37:25 +0000 (09:37 -0700)]
Merge "Whitelist file descriptors created through memfd_create." am:
d10a84cdfe am:
cb8118a096 am:
a1bb3b7d6a
am:
3ec6bb9f12
Change-Id: I95bb7b01ee7db485dfca75029f1bdc5bbcb47286
Steven Moreland [Tue, 29 Oct 2019 16:36:18 +0000 (09:36 -0700)]
Merge "ServiceManagerProxy: implement new method" am:
2a6f6ed94b am:
9ab8a0713f
am:
1574e4fd4e
Change-Id: I3018e9922154e7a33dd3aa4814d5f80e4118a77a
Jean-Michel Trivi [Tue, 29 Oct 2019 16:34:42 +0000 (16:34 +0000)]
Revert "AudioService: simplify/document locking"
This reverts commit
261a9f94828187e7cf08034a45259eb18a51f80c.
Reason for revert: b/
143503843
Change-Id: I7022f7fb9e06a5b223043c26b6849973fec420b0
Varun Shah [Wed, 23 Oct 2019 20:32:24 +0000 (13:32 -0700)]
Add TEST_MAPPING for UsageStats.
All tests under the packages android.app.usage and
com.android.server.usage (except StorageStatsServiceTest) will now run
in presubmit.
Also added UsageStatsTest CTS to postsubmit.
Bug:
143221092
Test: services/usage/java/com/android/server/usage/ atest
Change-Id: Ibac2b7d5a4f47f354e9190ff6df3aa16002f92f9
Nicolas Geoffray [Tue, 29 Oct 2019 16:30:18 +0000 (09:30 -0700)]
Merge "Whitelist file descriptors created through memfd_create." am:
d10a84cdfe am:
cb8118a096
am:
a1bb3b7d6a
Change-Id: Iabba8469fd6262ccf3dec7237ec9b57fe7cc4fda