Winson Chung
be00a83ae2
Fix NPE when logging already removed pip activity
...
Bug: 148943800
Test: Manual
2020-03-12 17:22:04 +00:00
Yifan Hong
3c706cfcac
Merge "Debug.isVmapStack reads kernel configs only" into rvc-dev
2020-03-12 16:58:54 +00:00
Adrian Roos
3a4be4a7b1
Merge "WindowInsetsController: Address API feedback" into rvc-dev
2020-03-12 16:13:43 +00:00
Philip P. Moltmann
9f0ee82df5
Merge "Call Compatibility.isChangeEnabled in calling app" into rvc-dev
2020-03-12 15:40:38 +00:00
Jay Aliomer
221945ad93
Merge "Migrate dark theme settings" into rvc-dev
2020-03-12 15:34:07 +00:00
Jay Aliomer
df6bdb5baf
Migrate dark theme settings
...
When restoring settings from a different phone,
UiModeManager did not update the new settings.
Now, the settings are loaded from local storage and changes applied
when the SettingsHelper restores a value of interest
Bug: 138671559
Test: manual test: reset phone1, setup, used data transfer tool to restore from phone2, check dark mode is the same as phone 2
Change-Id: I861bec342b3284e0f398c8610fcc6881c27601a5
2020-03-12 15:33:23 +00:00
Santiago Seifert
98955a625c
Merge "Address API renaming suggestions" into rvc-dev
2020-03-12 13:48:49 +00:00
Santiago Seifert
8e7b066a10
Address API renaming suggestions
...
Bug: 150855597
Test: CTS.
Change-Id: Id2154df12456bd0045e28f32fbe5483c9e87b67f
2020-03-12 13:42:29 +00:00
Gavin Corkery
e3f3fd1e4f
Merge "Revert "Only sync requests when there are changes to report"" into rvc-dev
2020-03-12 13:24:18 +00:00
Gavin Corkery
56b46738d7
Revert "Only sync requests when there are changes to report"
...
This reverts commit 68713d9830 .
Reason for revert: This breaks NetworkStagedRollbackTest. I know the cause, but reverting for now is the best option
Bug: 151212665
Change-Id: I00f0d3011b7ad2b65d452b3d74e508ffc4d1a857
2020-03-12 13:23:25 +00:00
TreeHugger Robot
507be52dc7
Merge "Properly handle InlineSuggestionsRequest with 0 max suggestion count" into rvc-dev
2020-03-12 13:02:28 +00:00
TreeHugger Robot
465dc5b58f
Merge "Remove duplicate term in the definition" into rvc-dev
2020-03-12 11:48:54 +00:00
Jooyung Han
9432967df0
Merge "Use aidl::nullable for nullable type in C++" into rvc-dev
2020-03-12 11:37:07 +00:00
Jooyung Han
66c567a8c4
Use aidl::nullable for nullable type in C++
...
To reduce the discrepance between old code which still uses
std::unique_ptr and new code using std::optional.
This might help to avoid merge-conflicts between branches.
Bug: 144773267
Test: m
Merged-In: Ie3196ee5cce17d77950eea9479d2cc1406e9e674
Merged-In: I33822bc76ef87637d5408849f64a0607e121792e
Change-Id: I33822bc76ef87637d5408849f64a0607e121792e
(cherry picked from commit ad62e8cbf5 )
Exempt-From-Owner-Approval: cherry-pick from master with owner's approval
2020-03-12 11:36:33 +00:00
TreeHugger Robot
94425b919b
Merge "Update path for SnapshotMergeReported." into rvc-dev
2020-03-12 10:38:43 +00:00
Tiger Huang
d464ccbc1f
Merge "Exclude insets sources for the floating windowing mode" into rvc-dev
2020-03-12 09:31:49 +00:00
Tiger Huang
7b558f7488
Merge "Make mStatusBar and mNavigationBar thread-safe in DisplayPolicy" into rvc-dev
2020-03-12 09:29:19 +00:00
Automerger Merge Worker
dd6b0c0c4e
[automerger skipped] Camera: Add new hidden API for camera open/close callback am: e375ee8f8a -s ours
...
am skip reason: Change-Id I04cae782d96f0e32be8ef588dcd328f84b32887a with SHA-1 6d76d3b1f6 is in history
Change-Id: I0d647e4b0030dccfd7078e32de648a1a34204abc
2020-03-12 09:22:15 +00:00
Automerger Merge Worker
943ca4cb16
[automerger skipped] DO NOT MERGE - Kill apps outright for API contract violations am: 45a53e6cb8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ice869f1c7c6bed8d3af2d7673adfd12ea95313b6
2020-03-12 09:21:48 +00:00
Automerger Merge Worker
8f267e43ee
[automerger skipped] Merge "Fix potential NPE while releasing worker thread of ImageWallpaper" into qt-qpr1-dev am: 85fc58ae81 -s ours
...
am skip reason: Change-Id I243274af54538fc89268c448aa2c5a95f63c7ae3 with SHA-1 4e4044060e is in history
Change-Id: I54834c769ec5aa2b6b98a94ac57db1701f797388
2020-03-12 09:19:48 +00:00
Automerger Merge Worker
f087bcf97f
Merge "Properly rotate cutout protection rect" into qt-qpr1-dev am: d87fd3b56a
...
Change-Id: If9e14551a92951e54d919dd571d614224b6eca4a
2020-03-12 09:18:59 +00:00
Automerger Merge Worker
d5568386cd
[automerger skipped] Merge "DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius" into qt-qpr1-dev am: ead4f22509 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie1003525dcf0d66a37cd80af234070f3778fa1a4
2020-03-12 09:17:57 +00:00
Automerger Merge Worker
7afbbd7f3b
[automerger skipped] RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities am: 2be3ba4973 am: 0d8b222051 am: 3a6039d59a -s ours am: 862ceca282 -s ours am: 1884cb7149 am: b308e9eca4 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I52f4301b4864dc0c235cca64399adcf95949cc2d
2020-03-12 09:17:15 +00:00
Automerger Merge Worker
263d244edf
[automerger skipped] Merge "DO NOT MERGE Add null check for status bar transitions" into qt-qpr1-dev am: 548c3bae81 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I09d049d30b6fc97623c21f8b750661c2ae4219d8
2020-03-12 09:14:42 +00:00
Automerger Merge Worker
ea7607a07e
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours am: 074acecf67 -s ours am: a27754f5cd am: dca2204ab5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I28a6e361590febe9fee53f894d6a0bc5ac4467f6
2020-03-12 09:14:07 +00:00
Automerger Merge Worker
2991fea69e
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-qpr1-dev am: b2307f8db4 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I97b81a597558d260ca738a0caf08a793a6d240be
2020-03-12 09:13:36 +00:00
Automerger Merge Worker
e926c3f739
[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into pi-dev am: d9d727b959 -s ours am: 5d7dd7b2dd am: e342280213 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie55af947a4e4a7dfb2f42b5c6a95226f3e7f6219
2020-03-12 09:13:15 +00:00
Automerger Merge Worker
0be3fc8477
[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e880978 -s ours am: da2c3df4ce -s ours am: 6e298f6477 am: b73ced79ec -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icc7d750177b6ca1671c447a930ca66557fb47712
2020-03-12 09:13:04 +00:00
Sergey Nikolaienkov
9df9b32b95
Merge "Annotate appropriate AudioRecordingDisclosureBar's methods with @UiThread" into rvc-dev
2020-03-12 08:59:10 +00:00
Paul Hu
aff8656fd2
Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" into rvc-dev
2020-03-12 08:51:44 +00:00
Martijn Coenen
cd051e846c
Merge "Fix NPE in FileSystemProvider." into rvc-dev
2020-03-12 07:47:11 +00:00
Zoey Chen
f489f1994f
Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" into rvc-dev
2020-03-12 06:20:33 +00:00
Menghan Li
3fdf863778
Merge "Update R acessibility assets and strings (3/n)" into rvc-dev
2020-03-12 05:37:47 +00:00
Lucas Lin
2e627303df
Merge "Make NETWORK_STATUS notification to be blockable" into rvc-dev
2020-03-12 04:53:13 +00:00
Jacky Kao
ac337e7add
Merge "Throw IllegalArgumentException for takeScreenshot()" into rvc-dev
2020-03-12 04:15:13 +00:00
Lucas Dupin
888edd6fdc
Merge "Implement wallpaper zoom hooking it to the shade" into rvc-dev
2020-03-12 04:07:51 +00:00
Les Lee
84b4877d85
Merge "wifi: API Review: API changes to SoftApConfiguration.Builder" into rvc-dev
2020-03-12 03:49:32 +00:00
TreeHugger Robot
c688e204e1
Merge "Remove misleading comments" into rvc-dev
2020-03-12 03:39:07 +00:00
zoey chen
7cb5ca8e7d
Revert [Telephony mainline] Add SystemApi and NonNull annotation
...
Reason: Revisit and redesign in S
Bug: 147390517
Test: make
Change-Id: I0749492a5648dfa2fb83271f349a8370972f7032
Merged-In: I0749492a5648dfa2fb83271f349a8370972f7032
(cherry picked from commit 2d280f1bb4 )
2020-03-12 03:22:48 +00:00
Automerger Merge Worker
2e15fabc0d
Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
...
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
Merged-In: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
(cherry picked from aosp/1243868)
2020-03-12 01:45:22 +00:00
Hall Liu
97363dce3c
Merge "Hide APIs introduced in earlier commit" into rvc-dev
2020-03-12 01:31:41 +00:00
Andy Hung
42ee916c1f
Merge "SoundPool: Set completion flag before promise" into rvc-dev
2020-03-12 01:23:50 +00:00
TreeHugger Robot
592181386c
Merge "Making time-zone an API constant" into rvc-dev
2020-03-12 01:23:28 +00:00
Feng Cao
44dc2bdcb2
Properly handle InlineSuggestionsRequest with 0 max suggestion count
...
Test: manual, atest InlineSuggestionsRequestTest
Bug: 150142709
Change-Id: Id0bba142526641964087d29bf515b7d7a817bae0
2020-03-11 18:11:52 -07:00
TreeHugger Robot
cb9a1807f8
Merge "Not demote procstate to PROC_STATE_FOREGROUND_SERVICE any more." into rvc-dev
2020-03-12 01:03:52 +00:00
TreeHugger Robot
6a781e90bd
Merge "Throw RuntimeException/ImsException when binder is null." into rvc-dev
2020-03-12 00:41:03 +00:00
Daniel Bright
50b916bd53
Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" into rvc-dev
2020-03-12 00:33:51 +00:00
Yifan Hong
77c1f592fa
Debug.isVmapStack reads kernel configs only
...
... but not other runtime VINTF info. This may or may
not fix the nullptr exception when accessing getRuntimeInfo().
In either case, this change should improves code health in general:
- it avoids reading things it doesn't need
- it avoids copying the map
Bug: 151092221
Test: m libandroid_runtime -j
Change-Id: I6cb9052eb56fd83ef7ee81751d9791533a36aeed
2020-03-11 17:10:55 -07:00
Jacky Kao
0ad1f82733
Throw IllegalArgumentException for takeScreenshot()
...
Throw IllegalArgumentException for non default display
since it’s unsupported
Bug: 150865445
Test: a11y CTS & unit tests
Change-Id: Iac0602e444d23b28ea05d29dd4605c7a821b641a
2020-03-12 07:56:57 +08:00
TreeHugger Robot
5855ce58e9
Merge "Honor org.junit.Ignore annotation." into rvc-dev
2020-03-11 23:48:37 +00:00