OSDN Git Service
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."
TreeHugger Robot [Tue, 29 Oct 2019 17:49:34 +0000 (17:49 +0000)]
Merge "Add TEST_MAPPING for UsageStats."
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
Matt Pape [Tue, 29 Oct 2019 16:28:10 +0000 (16:28 +0000)]
Merge "Enforce READ_DEVICE_CONFIG in DeviceConfig.getProperties path."
Steven Moreland [Tue, 29 Oct 2019 16:26:57 +0000 (09:26 -0700)]
Merge "ServiceManagerProxy: implement new method" am:
2a6f6ed94b
am:
9ab8a0713f
Change-Id: I5af655cba2bb416ed517ba722f0f5ec46610c9bc
Nicolas Geoffray [Tue, 29 Oct 2019 16:22:24 +0000 (09:22 -0700)]
Merge "Whitelist file descriptors created through memfd_create." am:
d10a84cdfe
am:
cb8118a096
Change-Id: I03fe4529d584221d0ea64f95cdb24d2a970fcf50
Steven Moreland [Tue, 29 Oct 2019 16:14:44 +0000 (09:14 -0700)]
Merge "ServiceManagerProxy: implement new method"
am:
2a6f6ed94b
Change-Id: Id8d345fbe03cefed512b7dbb567b384dd20468da
Nicolas Geoffray [Tue, 29 Oct 2019 16:10:08 +0000 (09:10 -0700)]
Merge "Whitelist file descriptors created through memfd_create."
am:
d10a84cdfe
Change-Id: I7defdd47f50b4b225093fd283bcf0fc64b26d6fb
TreeHugger Robot [Tue, 29 Oct 2019 16:09:21 +0000 (16:09 +0000)]
Merge "Revert "Revert "Move DozeServiceHost out of StatusBar."""
Eric Laurent [Tue, 29 Oct 2019 15:48:55 +0000 (15:48 +0000)]
Merge "MediaRecorder: add privileged permission for AudioSource.RADIO_TUNER"
Steven Moreland [Tue, 29 Oct 2019 15:45:43 +0000 (15:45 +0000)]
Merge "ServiceManagerProxy: implement new method"
Nicolas Geoffray [Tue, 29 Oct 2019 15:45:03 +0000 (15:45 +0000)]
Merge "Whitelist file descriptors created through memfd_create."
Marco Nelissen [Tue, 29 Oct 2019 15:41:05 +0000 (08:41 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'" am:
00639037d7 am:
579c900beb am:
c3d0b20217
am:
acf1850ba9
Change-Id: I4c054e411a71093ce53f3331a955e2bd40dec3a2
Julia Reynolds [Tue, 29 Oct 2019 15:34:00 +0000 (15:34 +0000)]
Merge "Add ability to write and read Notification history."
Marco Nelissen [Tue, 29 Oct 2019 15:28:59 +0000 (08:28 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'" am:
00639037d7 am:
579c900beb
am:
c3d0b20217
Change-Id: Id2a8d64424c96c235d35929bf573aea36a7ffc7d
Heemin Seog [Tue, 29 Oct 2019 15:25:18 +0000 (15:25 +0000)]
Merge "Make the default user the current user (not 0)"
Marco Nelissen [Tue, 29 Oct 2019 15:15:17 +0000 (08:15 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'" am:
00639037d7
am:
579c900beb
Change-Id: I3640dfae077fcd84bdf332ed027c15f2cabc95a1
Marco Nelissen [Tue, 29 Oct 2019 15:02:15 +0000 (08:02 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'"
am:
00639037d7
Change-Id: Ie34e205683ed831dd6dbb7a556323c04fb0b949c
arangelov [Fri, 18 Oct 2019 17:03:44 +0000 (18:03 +0100)]
Separate adapter logic from ChooserActivity and ResolverActivity
Test: atest com.android.internal.app.ChooserActivityTest
Test: atest com.android.internal.app.ResolverActivityTest
Bug:
142537267
Bug:
142538125
Change-Id: Ia4a61e3dc7cbac5c31e0d5b126e033a043c81d90
Matt Pape [Thu, 17 Oct 2019 22:20:34 +0000 (15:20 -0700)]
Enforce READ_DEVICE_CONFIG in DeviceConfig.getProperties path.
Test: atest CtsDeviceConfigTestCases
atest FrameworksCoreTests:DeviceConfigTest
atest FrameworksCoreTests:SettingsProviderTest
atest SettingsProviderTest:DeviceConfigServiceTest
Bug:
142891501
Change-Id: Ic01632514862b640d9e3b280b1ac15b1391c3c17
Marco Nelissen [Tue, 29 Oct 2019 14:31:55 +0000 (14:31 +0000)]
Merge "Declare Visualizer::setEnabled() 'final'"
Julia Reynolds [Mon, 21 Oct 2019 15:37:35 +0000 (11:37 -0400)]
Add ability to write and read Notification history.
Bug:
137396965
Test: atest
Change-Id: I6bfdd0f6906dcf9c58b592e03bef335c4920d94d
Roshan Pius [Tue, 29 Oct 2019 13:24:51 +0000 (13:24 +0000)]
Merge "proto(wifi): Move wifi proto out of common folder"
TreeHugger Robot [Tue, 29 Oct 2019 13:03:56 +0000 (13:03 +0000)]
Merge "[SecurityController] Listen to USER_UNLOCKED"
Dave Mankoff [Mon, 28 Oct 2019 21:51:26 +0000 (17:51 -0400)]
Revert "Revert "Move DozeServiceHost out of StatusBar.""
This restores the refactoring of DozeServiceHost.
It was originally reverted because of strange behavior seen on the
lock screen that prevents the phone from being unlocked. Upon
review, I found that a call to StatusBar.updateDozingState() had been
erroneously omitted from StatusBar.onDozingChanged. Restoring this
call seems to make the observed problem go away.
Bug:
143484506
Test: atest SystemUITests
Change-Id: Ic024db5a3f2bdca3e877aa067f21cab6a5a45454
Ivan Podogov [Tue, 29 Oct 2019 12:37:07 +0000 (12:37 +0000)]
Merge "Add AOSP intent for Work Policy Info"
TreeHugger Robot [Tue, 29 Oct 2019 11:35:36 +0000 (11:35 +0000)]
Merge "Change AppOps collection to include historical appops since beginning of time. Running totals are expected to work correctly with value metric."
TreeHugger Robot [Tue, 29 Oct 2019 10:18:45 +0000 (10:18 +0000)]
Merge "Convert Android.mk to Android.bp for CtsShim*"
Ivan Podogov [Fri, 2 Aug 2019 12:35:40 +0000 (13:35 +0100)]
Add AOSP intent for Work Policy Info
Bug:
134391103
Test: make, GTS
Change-Id: Ib51a00a40b04bcdd6db8f8c1ae8662d850c54713
TreeHugger Robot [Tue, 29 Oct 2019 09:53:47 +0000 (09:53 +0000)]
Merge "Wellbeing app can enable QUIET_MODE"
TreeHugger Robot [Tue, 29 Oct 2019 09:49:45 +0000 (09:49 +0000)]
Merge "Reduce the health check timeout (2/n)"
TreeHugger Robot [Tue, 29 Oct 2019 09:39:18 +0000 (09:39 +0000)]
Merge "[HWUI] Use ANativeWindow_get{Height, Width}"
Nate Fischer [Tue, 29 Oct 2019 07:49:54 +0000 (00:49 -0700)]
Merge "WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff am:
7baf85ccaf" into qt-qpr1-dev-plus-aosp
am:
55f37dd299
Change-Id: I64749dbec139dba1195821d8130334ccc776eaaf
Nate Fischer [Tue, 29 Oct 2019 07:47:07 +0000 (00:47 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff am:
b2bc8ddcfb
am:
a906395b9e
Change-Id: I3285728d0692fb16d611d6b18fc826c3ce87f238
Android Build Merger (Role) [Tue, 29 Oct 2019 07:40:55 +0000 (07:40 +0000)]
Merge "WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff am:
7baf85ccaf" into qt-qpr1-dev-plus-aosp
Nate Fischer [Tue, 29 Oct 2019 07:39:55 +0000 (00:39 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff
am:
b2bc8ddcfb
Change-Id: I28eb0e3ffcef7256d3419dbde5bb9bcce2614172
Nate Fischer [Tue, 29 Oct 2019 07:39:55 +0000 (00:39 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff
am:
7baf85ccaf
Change-Id: I50ff76fef9a3d4f3044fa3c24eb3e7768dd12af8
Nate Fischer [Tue, 29 Oct 2019 07:32:55 +0000 (00:32 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44
am:
3ea1a6d6ff
Change-Id: I9cf9fd9b8cecb266d2cc2aa2cacf5e9fc2339ede
Nate Fischer [Tue, 29 Oct 2019 07:32:55 +0000 (00:32 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44
am:
3ea1a6d6ff
Change-Id: Id1a2fc32030f8a5aed8af4dfd6c7046a65d51a6e
Nate Fischer [Tue, 29 Oct 2019 07:26:23 +0000 (00:26 -0700)]
WebView: clarify docs for onShowCustomView
am:
aaaa660a44
Change-Id: Idaa495f908c914057ac785bfeca1f2f15a0a5fd8
TreeHugger Robot [Tue, 29 Oct 2019 06:32:27 +0000 (06:32 +0000)]
Merge "Change AIDL module name"
TreeHugger Robot [Tue, 29 Oct 2019 06:31:40 +0000 (06:31 +0000)]
Merge "Make CarStatusBar a Singleton"
TreeHugger Robot [Tue, 29 Oct 2019 06:15:37 +0000 (06:15 +0000)]
Merge "Rewrite testNetworkFailedRollback_Phase3 (1/n)"
TreeHugger Robot [Tue, 29 Oct 2019 06:14:28 +0000 (06:14 +0000)]
Merge "Make the adjustment of stack consistent for finishing activity"
Jin Seok Park [Thu, 24 Oct 2019 08:35:31 +0000 (17:35 +0900)]
Add function for adding EXIF to PNG files
Added tests for both PNG files that do not have EXIF data and that
do have EXIF data.
Bug:
138376314
Test: Run atest ExifInterfaceTest
Change-Id: I3394940aa4466fac259117a4a0d226899068fd7d
Arc Wang [Tue, 29 Oct 2019 05:50:34 +0000 (05:50 +0000)]
Merge "[Wi-Fi] Support expiration time and passpoint configuration version in AccessPoint"
TreeHugger Robot [Tue, 29 Oct 2019 05:36:35 +0000 (05:36 +0000)]
Merge "Add CDM API to filter by BSSID bitmask"
Anthony Han [Tue, 29 Oct 2019 05:11:04 +0000 (22:11 -0700)]
Merge "Log display white balance in animator" into qt-qpr1-dev am:
5ba87c154e
am:
52dc96d4c8
Change-Id: I04a718872740825cc72967880f1c4c27fe83b6bf
Anthony Han [Tue, 29 Oct 2019 05:04:07 +0000 (22:04 -0700)]
Merge "Log display white balance in animator" into qt-qpr1-dev
am:
5ba87c154e
Change-Id: I7d19d00ae5dfac3afa9426f0466682f98ead6b6f
TreeHugger Robot [Tue, 29 Oct 2019 04:49:39 +0000 (04:49 +0000)]
Merge "Log display white balance in animator" into qt-qpr1-dev
TreeHugger Robot [Tue, 29 Oct 2019 04:23:41 +0000 (04:23 +0000)]
Merge "Temporarily disable DeviceConfigTest.testOnPropertiesChangedListener"
TreeHugger Robot [Tue, 29 Oct 2019 04:21:31 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Jin Seok Park [Tue, 29 Oct 2019 04:09:34 +0000 (04:09 +0000)]
Merge "Add support for parsing WebP files"
TreeHugger Robot [Tue, 29 Oct 2019 04:04:54 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 29 Oct 2019 02:08:57 +0000 (02:08 +0000)]
Merge "Link to CDM guide from CDM javadoc"
Joanne Chung [Tue, 29 Oct 2019 02:06:51 +0000 (02:06 +0000)]
Merge "Add callbacks when TextClassifierService connection status change"
Sasha Kuznetsov [Tue, 29 Oct 2019 01:21:52 +0000 (01:21 +0000)]
Merge "Create unit tests for GnssManagerService Test: atest GnssManagerServiceTest.java"
Sudheer Shanka [Tue, 29 Oct 2019 00:13:27 +0000 (00:13 +0000)]
Merge "Fix NetworkPolicyManagerServiceTest."
Peter Wang [Mon, 28 Oct 2019 23:25:43 +0000 (16:25 -0700)]
[automerger skipped] Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9 am:
4dd1013a04 am:
8f6945f47b
am:
20c679d182 -s ours
am skip reason: change_id I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183 with SHA1
fac73bd00b is in history
Change-Id: If5a28c518c58ecdabc87947555ed1a61d090c7af
Peter Wang [Mon, 28 Oct 2019 23:25:31 +0000 (16:25 -0700)]
[automerger skipped] Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6 am:
aeeff0287c am:
20c9b8e520
am:
d3c5ae687e -s ours
am skip reason: change_id I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803 with SHA1
406cee2b72 is in history
Change-Id: I97fb222360b4086100e9b7c88db71e045f29f0b7
Peter Wang [Mon, 28 Oct 2019 23:19:04 +0000 (16:19 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9 am:
4dd1013a04
am:
8f6945f47b
Change-Id: Id4b990a8107da649f2e59efb62ea9431e1e4179a
Peter Wang [Mon, 28 Oct 2019 23:18:55 +0000 (16:18 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6 am:
aeeff0287c
am:
20c9b8e520
Change-Id: I2fac1ba6f9740c28b11c352c4b06c4b91ba303b1
Peter Wang [Mon, 28 Oct 2019 23:06:02 +0000 (16:06 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9
am:
4dd1013a04
Change-Id: Idbdcc5b47bddaa577113843c4fde7f0115428935
Peter Wang [Mon, 28 Oct 2019 23:05:52 +0000 (16:05 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6
am:
aeeff0287c
Change-Id: I1bb12eaca6f0efffd728be1d7e9c6d3d2fa9efa8
Peter Wang [Mon, 28 Oct 2019 22:58:57 +0000 (15:58 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
am:
10d6f20bc9
Change-Id: I0acfb85416f42fd570297554a0ce231a12914649
Peter Wang [Mon, 28 Oct 2019 22:58:49 +0000 (15:58 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
am:
8db38c9ef6
Change-Id: I55feb7a5515aa05dea0b5482f6d84b67c6686948
Jack Yu [Mon, 28 Oct 2019 22:58:48 +0000 (15:58 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1 am:
614b2ca5ef am:
3036bcf628
am:
3998e15d17
Change-Id: I0c1fa7ce4aa469a46fd6dcdd12ebfb614c138664
Jack Yu [Mon, 28 Oct 2019 22:52:00 +0000 (15:52 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1 am:
614b2ca5ef
am:
3036bcf628
Change-Id: I6ebde4a89a44879865e198e5be14e9f6a49f67b5
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
Jack Yu [Mon, 28 Oct 2019 22:38:44 +0000 (15:38 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1
am:
614b2ca5ef
Change-Id: I153131c15ed3890e259aa156b185c2a36fd12f26
Rubin Xu [Mon, 28 Oct 2019 22:29:59 +0000 (22:29 +0000)]
Merge "Handle the case when KeyChain binding fails"
Jack Yu [Mon, 28 Oct 2019 22:26:01 +0000 (15:26 -0700)]
Merge "Add new carrier configuration for GET INPUT command"
am:
48ad8828d1
Change-Id: Ib9dc938b2dcaa069fdca20f72c9eacb7d60356c7
Jack Yu [Mon, 28 Oct 2019 22:06:43 +0000 (22:06 +0000)]
Merge "Add new carrier configuration for GET INPUT command"
Selim Cinek [Mon, 28 Oct 2019 21:06:35 +0000 (14:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev am:
39195ba211
am:
db59aba594 -s ours
am skip reason: subject contains skip directive
Change-Id: I178eca4ce0739bfbc2d49c0f85654dc14a805a93
Selim Cinek [Mon, 28 Oct 2019 21:06:29 +0000 (14:06 -0700)]
[automerger skipped] DO NOT MERGE Revert all scrim related changes in qpr am:
f97d7f73cf
am:
df1a2a031d -s ours
am skip reason: subject contains skip directive
Change-Id: I69e1ea1816d2e3c492d8190884b0a7104a295fb7
Selim Cinek [Mon, 28 Oct 2019 20:51:55 +0000 (13:51 -0700)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
am:
39195ba211
Change-Id: Ib8f292c600dae30fc160ab3ab00b188773e911e5
Selim Cinek [Mon, 28 Oct 2019 20:51:49 +0000 (13:51 -0700)]
DO NOT MERGE Revert all scrim related changes in qpr
am:
f97d7f73cf
Change-Id: I283806af08af94d90408761e318285c9c725bf55
Nate Fischer [Fri, 25 Oct 2019 03:35:54 +0000 (20:35 -0700)]
WebView: clarify docs for onShowCustomView
No change to logic, only docs.
This clarifies the docs for onShowCustomView. This @links to
FLAG_FULLSCREEN, reminds the developer they must override both
onShowCustomView and onHideCustomView, and provides guidance for
CustomViewCallback.
Bug:
143247282
Test: make -j4 docs
Change-Id: I64de3723674da5c138438921cc8232c4bf2a3d98
Peter Wang [Mon, 28 Oct 2019 20:33:55 +0000 (13:33 -0700)]
[automerger skipped] Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08 am:
a0b42289aa am:
479a640a72
am:
bd0295df59 -s ours
am skip reason: change_id Ib8496ed6dbc6179940892de8df7901e84dd67d76 with SHA1
0c1297b2d7 is in history
Change-Id: I867cb82dea341aa0eadd24fdca13e03f5d40cb6c
Selim Cinek [Mon, 28 Oct 2019 20:31:41 +0000 (20:31 +0000)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
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:
143310145
Test: manual - took before and after videos
Change-Id: Ia0b6a56859889d538e21f807a88bc5217d89e64a
Peter Wang [Mon, 28 Oct 2019 20:21:48 +0000 (13:21 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08 am:
a0b42289aa
am:
479a640a72
Change-Id: Ica15801fe3b348964f975405e859f8f7b86a6938
TreeHugger Robot [Mon, 28 Oct 2019 20:18:12 +0000 (20:18 +0000)]
Merge "Fix permission issue during LockSettingsService.dump()"
Nathan Harold [Tue, 15 Oct 2019 18:28:00 +0000 (11:28 -0700)]
[DO NOT MERGE] Check CellInfoCallback Detail for Null
In cases where the source of the CellInfo fails
but does not generate a Throwable, the detail info
will not be provided and should be null. Inside the
user process, we need to check for null before
dereferencing the detail object. Oops. :-(
Bug:
142706765
Bug:
142421696
Test: manual
Merged-In: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
Change-Id: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
(cherry picked from commit
fff052067c1926bd0e5ef5f852d4adba5333934d)
Peter Wang [Mon, 28 Oct 2019 20:08:44 +0000 (13:08 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08
am:
a0b42289aa
Change-Id: I20870973a273324dc477dd66af36df0f8d11f880
Sasha Kuznetsov [Fri, 4 Oct 2019 00:30:46 +0000 (17:30 -0700)]
Create unit tests for GnssManagerService
Test: atest GnssManagerServiceTest.java
Change-Id: I9ef40a99d898119251e3ea1d353a61368313ba07
Peter Wang [Mon, 28 Oct 2019 19:54:27 +0000 (12:54 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
am:
ca01a7ee08
Change-Id: If8018a82a3891649cb7a23e5631cf77de6547da6
OSDN Git Service
