OSDN Git Service
TreeHugger Robot [Wed, 18 Dec 2019 01:42:06 +0000 (01:42 +0000)]
Merge "DO NOT MERGE: Exclude nearby_sharing_component from backup test" into qt-qpr1-dev
Dan Sandler [Tue, 17 Dec 2019 03:32:23 +0000 (22:32 -0500)]
DO NOT MERGE: Exclude nearby_sharing_component from backup test
Fixes:
146019461
Test: atest SettingsBackupTest
Change-Id: Ieb953284f2c00d69220e776f2b628f73013140e0
TreeHugger Robot [Wed, 18 Dec 2019 00:34:12 +0000 (00:34 +0000)]
Merge "Fix lock screen wallpaper" into qt-qpr1-dev
Automerger Merge Worker [Tue, 17 Dec 2019 23:43:26 +0000 (23:43 +0000)]
Merge "docs: Fixed typo" into qt-dev am:
3e4f4f9933 am:
6231cffbb8
Change-Id: I1653273a1d9c0eae7b8a8406bc188e2e909ffaa0
Automerger Merge Worker [Tue, 17 Dec 2019 23:31:47 +0000 (23:31 +0000)]
Merge "docs: Fixed typo" into qt-dev am:
3e4f4f9933
Change-Id: Ic625ffed3ce23a7766a12a153d9794a4abf7a6b5
Andrew Solovay [Tue, 17 Dec 2019 23:20:29 +0000 (23:20 +0000)]
Merge "docs: Fixed typo" into qt-dev
Jay Aliomer [Tue, 17 Dec 2019 21:58:37 +0000 (21:58 +0000)]
Merge "Dark theme battery saver tile secondary text" into qt-qpr1-dev
TreeHugger Robot [Tue, 17 Dec 2019 21:27:34 +0000 (21:27 +0000)]
Merge "Avoid lock inversion." into qt-qpr1-dev
Lucas Dupin [Tue, 17 Dec 2019 21:14:53 +0000 (13:14 -0800)]
Fix lock screen wallpaper
LockscreenWallpaper was set to null on NotificationMediaManager because
StatusBar#mWallpaperSupported was not initialized yet.
Fixes:
146252300
Test: manual
Change-Id: I4c5151ad6b40d0f0996fdbb825745729cc003425
Merged-In: I4c5151ad6b40d0f0996fdbb825745729cc003425
Jay Aliomer [Tue, 17 Dec 2019 20:04:15 +0000 (15:04 -0500)]
Dark theme battery saver tile secondary text
Dark theme tile on battery saver should show
"Dark theme" and "Battery saver" on two lines
Test: manual. turn battery saver on while dark theme on auto
Fixes:
146439388
Change-Id: I460b582ca7fcf244b406d6eaf70c10e4edc52d85
Automerger Merge Worker [Tue, 17 Dec 2019 20:18:50 +0000 (20:18 +0000)]
docs: Removing most of the intro to PowerManager API am:
3fea8d1042 am:
f92878e651
Change-Id: I07ea69318879ad5c70c99880c6cc6c57a348d76a
Automerger Merge Worker [Tue, 17 Dec 2019 19:58:53 +0000 (19:58 +0000)]
docs: Removing most of the intro to PowerManager API am:
3fea8d1042
Change-Id: I25c41e4998197ef1df2c95fb1f2360360970389f
TreeHugger Robot [Tue, 17 Dec 2019 19:01:59 +0000 (19:01 +0000)]
Merge "[DO NOT MERGE] Better timestamp for shutdown and startup events." into qt-qpr1-dev
Hui Yu [Tue, 17 Dec 2019 19:01:15 +0000 (19:01 +0000)]
Merge "[DO NOT MERGE] Reset mTrackingReportedValues in endSample()" into qt-qpr1-dev
TreeHugger Robot [Tue, 17 Dec 2019 03:21:16 +0000 (03:21 +0000)]
Merge "DO NOT MERGE - Fix StatusBar.updateIsKeyguard() when suspending to RAM." into qt-qpr1-dev
Hui Yu [Sat, 23 Nov 2019 02:35:12 +0000 (18:35 -0800)]
[DO NOT MERGE] Reset mTrackingReportedValues in endSample()
Otherwise, when next SamplingTimer.update() is called, it will take
zero as start time.
Bug:
142466892
Test: NA.
Change-Id: I04625fadd8fd8bab3ba83b8e7cd10737ad34e60b
(cherry picked from commit
c7d49e01dd97aeefd365f2e808c7f5749db0c837)
Andrew Solovay [Mon, 16 Dec 2019 22:52:12 +0000 (14:52 -0800)]
docs: Fixed typo
Fixed a clear copy/paste error, docs had said "call getHeight() to
get the width" when it should have been "...to get the height".
Skipping staging since it's a simple text change.
Change-Id: Ic06557ac38517f409943585054835d774240ccf3
Test: make ds-docs
Exempt-from-owner-approval: Docs-only change
Bug:
144537947
Felipe Leme [Thu, 12 Dec 2019 20:17:53 +0000 (12:17 -0800)]
DO NOT MERGE - Fix StatusBar.updateIsKeyguard() when suspending to RAM.
That method was throwing a NPE on automotive because it's called before start()
Test: check logcat while running 'adb shell dumpsys car_service suspend'
Fixes:
146144370
Change-Id: Id863acac44f75b06c8cd1a0f0bcd6f23f8ab6fd9
(cherry picked from commit
20e362a92b8376b590d5df615265050dd6838c91)
Hui Yu [Wed, 4 Sep 2019 00:45:49 +0000 (17:45 -0700)]
[DO NOT MERGE] Better timestamp for shutdown and startup events.
Fix the bug that during android P to Q upgrade, DEVICE_SHUTDOWN
event mistakenly gets a newer timestamp than DEVICE_STARTUP event.
Bug:
139656029
Test: flash the device with android P, then upgrade to android Q,
then "adb shell dumpsys usagestats", observe DEVICE_SHUTDOWN
is before DEVICE_STARTUP.
Change-Id: I5429fe7648529be8379270adefd26bd98a31357c
Andrew Solovay [Thu, 5 Dec 2019 21:05:38 +0000 (13:05 -0800)]
docs: Removing most of the intro to PowerManager API
The intro text says PowerManager is discouraged, and almost
all the available wakelock options have long been deprecated.
Given that, I think it makes sense to remove most of that
intro and just point devs to FLAG_KEEP_SCREEN_ON instead.
Staged to:
go/dac-stage/reference/android/os/PowerManager
Test: make ds-docs
Bug:
145699347
Change-Id: I517366903f3d9743166d7edaddc08471af0803d9
Alex Lin [Mon, 16 Dec 2019 21:34:45 +0000 (21:34 +0000)]
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev
Alex Lin [Tue, 10 Dec 2019 19:10:34 +0000 (11:10 -0800)]
[DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug:
144702079
Test: manually tested
Change-Id: I21c146556e5406ecf5c72f74767ea8d5fc643aec
TreeHugger Robot [Mon, 16 Dec 2019 19:42:05 +0000 (19:42 +0000)]
Merge "Check for wallpaper service on DozeWallpaperState." into qt-qpr1-dev
Jayachandran Chinnakkannu [Mon, 16 Dec 2019 18:07:07 +0000 (18:07 +0000)]
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" into qt-qpr1-dev
TreeHugger Robot [Mon, 16 Dec 2019 11:04:37 +0000 (11:04 +0000)]
Merge "DO NOT MERGE - Do not show Bluetooth icon when headset is not active" into qt-qpr1-dev
TreeHugger Robot [Sat, 14 Dec 2019 16:49:31 +0000 (16:49 +0000)]
Merge "more precise definition for undecorated remoteviews" into qt-qpr1-dev
Eric Berglund [Fri, 13 Dec 2019 21:10:13 +0000 (13:10 -0800)]
DO NOT MERGE Fixing build, missing parameter.
Bug:
145946470,
146228232
Test: Builds locally
Change-Id: I7f3632c90ca424d70b1cc6e20f88e741ff25efaa
Jayachandran C [Fri, 13 Dec 2019 19:46:48 +0000 (11:46 -0800)]
Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED
Bug:
144739528
Test: Build
Change-Id: I27341bf7c1f6fc640ba51360f8a6035cdb86052b
Merged-In: I27341bf7c1f6fc640ba51360f8a6035cdb86052b
Felipe Leme [Thu, 12 Dec 2019 20:17:53 +0000 (12:17 -0800)]
Check for wallpaper service on DozeWallpaperState.
It's disabled by default on automotive builds.
Bug:
146157808
Test: check logcat while running 'adb shell dumpsys car_service suspend'
Change-Id: Ifb0815f260d61bb8307f4b7c7798d9a5684d0d20
(cherry picked from commit
6844c394fbb6e0170f893de58520a73fabaa1229)
Chris Wren [Thu, 12 Dec 2019 20:33:21 +0000 (15:33 -0500)]
more precise definition for undecorated remoteviews
Bug:
145994957
Test: atest NotificationRecordTest
Change-Id: I9427137879dc87f32231fbc5cb8ed34cf5ce787a
Eric Berglund [Fri, 13 Dec 2019 20:01:18 +0000 (20:01 +0000)]
Merge "DO NOT MERGE Triggering status bar refresh on locale change so that the notifications panel updates to the new language." into qt-qpr1-dev
Automerger Merge Worker [Fri, 13 Dec 2019 19:31:04 +0000 (19:31 +0000)]
Merge "Put userId at the end of parcel" into qt-dev am:
899f8301e0 am:
056b56c6b7
Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c
Automerger Merge Worker [Fri, 13 Dec 2019 19:11:21 +0000 (19:11 +0000)]
Merge "Put userId at the end of parcel" into qt-dev am:
899f8301e0
Change-Id: If6ce5c989102c8fb6cdc1fa82cde79817f6c3423
TreeHugger Robot [Fri, 13 Dec 2019 18:50:54 +0000 (18:50 +0000)]
Merge "Put userId at the end of parcel" into qt-dev
Heemin Seog [Fri, 13 Dec 2019 18:47:31 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Make fixes to make sysui more customizable" into qt-qpr1-dev
Automerger Merge Worker [Fri, 13 Dec 2019 18:19:00 +0000 (18:19 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours am:
929b23ac43 -s ours am:
d98efda2ba am:
0626709062
Change-Id: I80d933328f24433bf7f0b5087feaa25072f4b99a
Automerger Merge Worker [Fri, 13 Dec 2019 18:18:45 +0000 (18:18 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours am:
8c5af9b7d9 -s ours am:
1ed77b86cf am:
ee0de45fee
Change-Id: I5133d09b6f17678932516ace8650d884e84175d5
Automerger Merge Worker [Fri, 13 Dec 2019 18:04:31 +0000 (18:04 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours am:
929b23ac43 -s ours am:
d98efda2ba
Change-Id: I7feee02b0dfab2d74ee82fee39a2ba5a77c27f99
Automerger Merge Worker [Fri, 13 Dec 2019 18:04:14 +0000 (18:04 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours am:
8c5af9b7d9 -s ours am:
1ed77b86cf
Change-Id: Icdc837b6af117638414dea01063a66161ce8465c
Automerger Merge Worker [Fri, 13 Dec 2019 17:50:17 +0000 (17:50 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours am:
929b23ac43 -s ours
am skip reason: subject contains skip directive
Change-Id: I53d35a4d2f2c517ec50cfdbc22008bda2e4041c5
Automerger Merge Worker [Fri, 13 Dec 2019 17:49:57 +0000 (17:49 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours am:
8c5af9b7d9 -s ours
am skip reason: subject contains skip directive
Change-Id: I05c1ed670d07b677a8e6a20b4d50a06b7482cbc6
Automerger Merge Worker [Fri, 13 Dec 2019 17:37:31 +0000 (17:37 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea am:
ad56194783 -s ours
am skip reason: subject contains skip directive
Change-Id: I5b7670226082f60abc45ae023e687a8b0191f20e
Automerger Merge Worker [Fri, 13 Dec 2019 17:37:15 +0000 (17:37 +0000)]
[automerger skipped] RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d am:
e0465e2881 -s ours
am skip reason: subject contains skip directive
Change-Id: I67f8185d1a6d3b75fad924d07e8eb6e8e9db0207
Automerger Merge Worker [Fri, 13 Dec 2019 17:31:02 +0000 (17:31 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours am:
4505eccb39 -s ours am:
3c352b62af am:
8e3b22b5d7
Change-Id: Ib6b1c893ff93650a06919b3cfe333ba3ac6186f1
Automerger Merge Worker [Fri, 13 Dec 2019 17:30:35 +0000 (17:30 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am:
4b6e07283c -s ours am:
2b4b2c3d5a am:
512268ba7b
Change-Id: I129c434e45648047df954e6ef9d2c291f8d2817d
Automerger Merge Worker [Fri, 13 Dec 2019 17:29:54 +0000 (17:29 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am:
1e53d56481 am:
5830ae29c5
Change-Id: I8f7ad58c68a6aff639ec6e8e394b53f24e33fdfe
Automerger Merge Worker [Fri, 13 Dec 2019 17:29:38 +0000 (17:29 +0000)]
RESTRICT AUTOMERGE am:
b81f269ae2 am:
db965097eb
Change-Id: I78c1a49ba6c0b883b506320dbfa2503e4c3c4c5e
Automerger Merge Worker [Fri, 13 Dec 2019 17:14:42 +0000 (17:14 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f am:
5f1d7675ea
Change-Id: I197f9d12435267964c84bfcee18c371611fa728c
Automerger Merge Worker [Fri, 13 Dec 2019 17:14:28 +0000 (17:14 +0000)]
RESTRICT AUTOMERGE am:
fe4bf7926e am:
9680a6d75d
Change-Id: I490bf47b2c6588da4b28998333fbfb197688d6c0
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:57 +0000 (17:07 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours am:
4505eccb39 -s ours am:
3c352b62af
Change-Id: Ia263bc63065b686eec529b04036bcd89df0135e4
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:28 +0000 (17:07 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am:
4b6e07283c -s ours am:
2b4b2c3d5a
Change-Id: I01afa68e3cea31b7fe868d14fb612718cdf2a257
Automerger Merge Worker [Fri, 13 Dec 2019 17:07:06 +0000 (17:07 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am:
1e53d56481
Change-Id: I19ff0f27ad95dc5d80a1c6ae444a91befeba9670
Automerger Merge Worker [Fri, 13 Dec 2019 17:06:50 +0000 (17:06 +0000)]
RESTRICT AUTOMERGE am:
b81f269ae2
Change-Id: Ia2afa630f1df185c6d38775768d9f3dfb54a2f16
Automerger Merge Worker [Fri, 13 Dec 2019 17:02:27 +0000 (17:02 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours am:
4505eccb39 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a98fa39acee962cf209fa64abdac9a708497d98
Automerger Merge Worker [Fri, 13 Dec 2019 17:02:07 +0000 (17:02 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am:
0f41dc420f
Change-Id: I0b4b6a26b538d6f51780413376d70b6906877893
Automerger Merge Worker [Fri, 13 Dec 2019 17:01:46 +0000 (17:01 +0000)]
RESTRICT AUTOMERGE am:
fe4bf7926e
Change-Id: I92627314fc09b129f37b08192084c5b807a00ed2
Automerger Merge Worker [Fri, 13 Dec 2019 17:01:11 +0000 (17:01 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am:
4b6e07283c -s ours
am skip reason: subject contains skip directive
Change-Id: I5e7c7ba4ba9d7c460a1e73e9e5b0feb01b5ae31d
Automerger Merge Worker [Fri, 13 Dec 2019 16:57:18 +0000 (16:57 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am:
b64534ceb2 -s ours
am skip reason: subject contains skip directive
Change-Id: I46e62bd45f14b79772dbb584167a01bef66b314b
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:15 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev
Sterling Huber [Fri, 13 Dec 2019 16:44:14 +0000 (16:44 +0000)]
Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev
Heemin Seog [Wed, 11 Dec 2019 18:54:32 +0000 (10:54 -0800)]
DO NOT MERGE Make fixes to make sysui more customizable
Bug:
144567659
Bug:
145547127
Test: manual
Change-Id: I66a0a7794ecfcdddd47d28ee681c904f799c5928
Tony Mak [Tue, 10 Dec 2019 07:22:23 +0000 (07:22 +0000)]
Put userId at the end of parcel
userId is a new field added in ag/
8350816, and it is written in between
some old fields when we parcelize it.
That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.
In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.
Bug:
145962464
Bug:
123232892
Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest
Merged-In: I98137a095cddf0fb4c600e1e09eef507bb750528
Change-Id: I66f65ac4c81ca964f710404fd081496355276435
Automerger Merge Worker [Fri, 13 Dec 2019 00:44:35 +0000 (00:44 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am:
e8ba34a851 am:
a4967992c1
Change-Id: I4b60f33db0cb582580f19f82f4af1bebf63a75c1
Automerger Merge Worker [Fri, 13 Dec 2019 00:44:14 +0000 (00:44 +0000)]
RESTRICT AUTOMERGE am:
bf04ea6d3b am:
bcdf0aacd5
Change-Id: I32a343ab313d8f61d097f8ce2f705fff355777ef
Automerger Merge Worker [Fri, 13 Dec 2019 00:26:40 +0000 (00:26 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am:
e8ba34a851
Change-Id: Iefe7ac373d783298f608effd81ae50b21053d69c
Automerger Merge Worker [Fri, 13 Dec 2019 00:26:31 +0000 (00:26 +0000)]
RESTRICT AUTOMERGE am:
bf04ea6d3b
Change-Id: I4c99e09d21cd93af567f186ae1e86ab076c96ce3
TreeHugger Robot [Fri, 13 Dec 2019 00:15:10 +0000 (00:15 +0000)]
Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev
* changes:
RESTRICT AUTOMERGE Fixes NPE when preparing app data during init
RESTRICT AUTOMERGE Use KNOWN_PACKAGES when shared lib consumers
RESTRICT AUTOMERGE Handles null outInfo in deleteSystemPackageLI
Abhijoy Saha [Tue, 10 Dec 2019 21:52:26 +0000 (13:52 -0800)]
DO NOT MERGE Set CarSysUI unprovisioned state depending on SUW progress.
Use a controller to monitor KEY_SETUP_WIZARD_IN_PROGRESS and USER_SETUP_COMPLETE
flags to know when to set CarSysUI bars in an unprovisioned state and prevent
interactions with notification shade.
Bug:
145616123
Test: Manual
Change-Id: Ie035f049e3e9e7cb411fc9553a20e4c09078c121
Youngjun Kwak [Thu, 12 Dec 2019 22:25:14 +0000 (22:25 +0000)]
Merge "DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event." into qt-qpr1-dev
Eric Berglund [Thu, 12 Dec 2019 18:35:36 +0000 (10:35 -0800)]
DO NOT MERGE Triggering status bar refresh on locale change so that the notifications panel updates to the new language.
Bug:
145946470
Test: Manual
Change-Id: I85dddcf4596a74e3031618f24246b6af2fb158b4
TreeHugger Robot [Thu, 12 Dec 2019 22:23:16 +0000 (22:23 +0000)]
Merge "Check screenlock for unlock dialog" into qt-qpr1-dev
Long Ling [Thu, 12 Dec 2019 21:48:51 +0000 (21:48 +0000)]
Merge "Clamp brightness thresholds to the maximum brightness." into qt-qpr1-dev
Winson Chung [Thu, 12 Dec 2019 21:27:08 +0000 (21:27 +0000)]
Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev
Brad Ebinger [Thu, 12 Dec 2019 21:08:36 +0000 (21:08 +0000)]
Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev
Jay Aliomer [Thu, 12 Dec 2019 20:32:00 +0000 (20:32 +0000)]
Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev
TreeHugger Robot [Thu, 12 Dec 2019 20:29:43 +0000 (20:29 +0000)]
Merge "Make emergency notification dismissable" into qt-qpr1-dev
Santos Cordon [Thu, 28 Nov 2019 11:24:21 +0000 (11:24 +0000)]
Clamp brightness thresholds to the maximum brightness.
Bug:
144702254
Test: atest AutomaticBrightnessControllerTest
Change-Id: Ia8ac92cf306424d1324d028559f4260b9f80d482
Merged-In: Ia8ac92cf306424d1324d028559f4260b9f80d482
TreeHugger Robot [Thu, 12 Dec 2019 20:05:40 +0000 (20:05 +0000)]
Merge "Use correct calling identity during camera permission check" into qt-qpr1-dev
Grace Cheng [Thu, 12 Dec 2019 19:43:20 +0000 (19:43 +0000)]
Merge "Coarse location permission description change for automobile" into qt-qpr1-dev
Jeff Sharkey [Sat, 7 Dec 2019 16:15:29 +0000 (16:15 +0000)]
Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode
this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues
Fixes:
145694649
Fixes:
145161355
Fixes:
145776479
Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Matt Pietal [Thu, 12 Dec 2019 15:26:49 +0000 (10:26 -0500)]
[DO NOT MERGE] Resolver/Chooser - Fix 'no apps available' inset
When zero apps match a filter, the empty view is set to visible and
shown. There is harm in making sure the inset always get applied to
the empty view so that when resolver determines it needs to be
visible, it is set to be shown.
Test: atest ResolverActivityTest, ChooserActivityTest
Bug:
146133961
Change-Id: I7412df84f8f482219635ccd73dff8e4a21355a18
TreeHugger Robot [Thu, 12 Dec 2019 09:33:41 +0000 (09:33 +0000)]
Merge "Fix crash after destroyed" into qt-qpr1-dev
Automerger Merge Worker [Thu, 12 Dec 2019 08:43:03 +0000 (08:43 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours am skip reason: subject contains skip directive am:
3b8b2681aa -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
4536e07966 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I07ad787307e8373f84df7b8c715343f81c7ac1db
Automerger Merge Worker [Thu, 12 Dec 2019 08:42:56 +0000 (08:42 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours am skip reason: subject contains skip directive am:
5166a0a3a0 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
b2425ffb9f -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I16017c5f550220d9d5bd765f27d6bc5e6068d5d3
Automerger Merge Worker [Thu, 12 Dec 2019 07:54:50 +0000 (07:54 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours am skip reason: subject contains skip directive am:
3b8b2681aa -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: Idfc9a676a9f80381b8d85b3d3f4db6c8d82350ba
Automerger Merge Worker [Thu, 12 Dec 2019 07:54:47 +0000 (07:54 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours am skip reason: subject contains skip directive am:
5166a0a3a0 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: Ie592ed299a3138b0c440810e4dc51ac2c4861947
Automerger Merge Worker [Thu, 12 Dec 2019 07:30:47 +0000 (07:30 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours am skip reason: subject contains skip directive am:
1300362067 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd1c0eb3d1d9d0178f2cfddf341167eb741013a5
Automerger Merge Worker [Thu, 12 Dec 2019 07:30:36 +0000 (07:30 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours am skip reason: subject contains skip directive am:
dec51767c9 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc516d8aa87f24084cf3c7053bf260357ccbc72a
Automerger Merge Worker [Thu, 12 Dec 2019 07:10:26 +0000 (07:10 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b am:
ab6b640548 -s ours
am skip reason: subject contains skip directive
Change-Id: I9810b56bf25eca7d1ac4fcb3a40c269637c24558
Automerger Merge Worker [Thu, 12 Dec 2019 07:10:17 +0000 (07:10 +0000)]
[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922 am:
bf965b484f -s ours
am skip reason: subject contains skip directive
Change-Id: Idb67d00b6ace91b47ec5e633be5c2f23942934bf
Automerger Merge Worker [Thu, 12 Dec 2019 06:50:06 +0000 (06:50 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3 am:
9d5989df0b
Change-Id: I6ccba38eeffbdab3ef9b4e90fe269bd61aabf698
Automerger Merge Worker [Thu, 12 Dec 2019 06:49:56 +0000 (06:49 +0000)]
DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860 am:
a37fe87922
Change-Id: Ic5b84e6b650b01d38801a2ff39c059a51173fe0b
Brad Ebinger [Tue, 10 Dec 2019 00:09:57 +0000 (16:09 -0800)]
Add CarrierConfig for roaming PLMNS that will need emer DDS switch
When roaming, we assume that the roaming operator will support
control plane fallback for emergency SUPL. For roaming operators
that we know do not support control plane fallback, we must perform
a DDS switch before dialing an emergency number on that operator.
Bug:
144383368
Test: atest TeleServiceTests; manual
Merged-In: I4a033f89610fd409ea81c40230938720ca76541c
Change-Id: I4a033f89610fd409ea81c40230938720ca76541c
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:29 +0000 (05:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am:
090476d5f3
Change-Id: I731a7fa2643382bd0df6f2107424d370a6f765b3
Automerger Merge Worker [Thu, 12 Dec 2019 05:00:18 +0000 (05:00 +0000)]
DO NOT MERGE back porting for fixing sysui direct reply am:
08aae90860
Change-Id: Iebebd941ee806b4e06d35f2134113f609160396f
Automerger Merge Worker [Thu, 12 Dec 2019 04:38:28 +0000 (04:38 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am:
da2466a36d -s ours am skip reason: subject contains skip directive am:
4c19a822ac -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history am:
f81579f0b9 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I14b85400e9d1c85360d677839286dfe97bcc391a
TreeHugger Robot [Thu, 12 Dec 2019 04:00:33 +0000 (04:00 +0000)]
Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev
Automerger Merge Worker [Thu, 12 Dec 2019 03:43:28 +0000 (03:43 +0000)]
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am:
da2466a36d -s ours am skip reason: subject contains skip directive am:
4c19a822ac -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1
33f56060d5 is in history
Change-Id: I438a0c90c903fe615dddf4eb54e8ccaded51fc9c
OSDN Git Service
