Charles Munger
b773ec723d
Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46 am: 87119ab3e2
...
am: e28f085137
2019-11-25 07:29:17 -08:00
Charles Munger
6562afcd52
Merge "Deprecate TimingLogger" am: aec0ab99d4 am: 416618a591
...
am: d1c3f26e59
2019-11-25 07:28:40 -08:00
Charles Munger
718b71bdca
Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7 am: 8292d73554
...
am: d2db9aeebc
2019-11-25 07:28:01 -08:00
Xin Li
01c8aeae91
[automerger skipped] DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master am: ddc6af7053
...
am: d3a12aba2a
2019-11-25 07:26:54 -08:00
Jian-Yang Liu
347206ce9e
[automerger skipped] Merge "Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density." into qt-qpr1-dev am: 4ef328aee2" into qt-qpr1-dev-plus-aosp
...
am: dde4838774
2019-11-25 07:26:26 -08:00
JianYang Liu
c68a4ce067
[automerger skipped] Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density. am: 13e6642243" into qt-qpr1-dev-plus-aosp
...
am: 6738dd98c7
2019-11-25 07:25:18 -08:00
Jayachandran Chinnakkannu
c909c94864
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" am: 4257da213d am: d6900e4b3c
...
am: b52dfe672f
2019-11-25 07:24:46 -08:00
Ytai Ben-tsvi
925000d6b8
[automerger skipped] Merge changes from topic "hidl-memory-java" am: 887aa66d0a am: e74637df68
...
am: dd682aacaf335114af79
2019-11-25 07:23:37 -08:00
Paul Lawrence
acca2c292a
[automerger skipped] Merge "Use mContext directly, and enforce via logging" am: afb2c9e9cc -s ours am: 3d3f98c5fe -s ours
...
am: e7500867488c7f0100c7
2019-11-25 07:23:00 -08:00
David Castro
530c32a56e
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752 am: 3a6d5555cd am: 56be7c0b58
...
am: 1294b8b570
2019-11-25 07:22:29 -08:00
Jovana Knezevic
3c9e76327f
[automerger skipped] Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev am: d7353d5c33
...
am: be80fc48dfff3328346d
2019-11-25 07:21:52 -08:00
David Castro
534c700111
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev am: 716edf3883 am: a9a4771159 am: b563d173d2
...
am: 0f97261406
2019-11-25 07:21:20 -08:00
Kenny Root
4493b510fd
[automerger skipped] Merge "Make RecoverySystemService more testable" am: 49af39e751 am: 1b506101de
...
am: 93ea22120c96690bc4c9
2019-11-25 07:20:50 -08:00
Chalard Jean
839ff7dded
Merge changes I195d894e,I7069c111 am: 87ed7d7816 am: aab1364ef9
...
am: eb24ef664f
2019-11-25 07:20:17 -08:00
Andrei-Valentin Onea
c197bd9063
[automerger skipped] Merge "Add metrics constant for platform compat UI." am: 48bb84c619 -s ours am: c86bfb3390 -s ours
...
am: 0c990f464c053191eae2
2019-11-25 07:19:16 -08:00
Govinda Wasserman
656096f62a
[automerger skipped] Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev am: f924933058
...
am: 4b63818b1f2f3a476b23
2019-11-25 07:17:33 -08:00
Aaron Huang
fde6552f0c
Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b am: 4082917f46
...
am: d78b2a0b67
2019-11-25 07:16:49 -08:00
Anton Hansson
3cda6a23d7
Merge 37ccd4 into goog/master
...
Conflicted with Ifd6cfc77acf2284804a2f64011c2733b5c222369
Test: m
Change-Id: I2cb428a8cf6f194f2c33106df4610e0956bc994c
2019-11-25 14:48:04 +00:00
Alan Stokes
0f2b7fd29a
Merge "Delete PACKAGE_VERIFIER_USER_CONSENT from Settings."
2019-11-25 13:41:49 +00:00
Stanislav Zholnin
07dc98a72d
Merge "Optimize reporting for DangerousPermissionState atom"
2019-11-25 13:35:41 +00:00
Anton Hansson
d04028ce6f
Merge "Rename framework and service jars"
2019-11-25 13:15:58 +00:00
Martijn Coenen
e0ad70ff43
Merge "Start FUSE sessions before Vold mount returns"
2019-11-25 13:00:54 +00:00
Sergej Salnikov
f2c2a1b595
Merge "Delete SearchManager.launchAssistService and convert SearchManager.launchAssist into @SystemApi method that handles both phone and TV devices."
2019-11-25 12:08:08 +00:00
Carmen Agimof
7d72e1ea9a
Merge "Revert "Downgrade the compilation filter of unused apps.""
2019-11-25 11:01:05 +00:00
Fiona Campbell
5ffc29449b
Merge "Use -1.0f in SurfaceControl to turn off brightness"
2019-11-25 11:00:32 +00:00
TreeHugger Robot
0ab5dcf39f
Merge "Use new api to disconnect all bt profiles"
2019-11-25 10:49:43 +00:00
TreeHugger Robot
104f3297b4
Merge "Compute screen layout for compat size app"
2019-11-25 09:14:26 +00:00
hughchen
fb0c7ad00c
Use new api to disconnect all bt profiles
...
Fixes: 141582844
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I432c12b60016d2230df625155d3c76dbba926077
2019-11-25 17:04:06 +08:00
TreeHugger Robot
2c5887a426
Merge "VibratorService: AIDL Amplitude API Change"
2019-11-25 05:04:45 +00:00
Jackal Guo
1e825b0eb2
Merge "Update accessibility focus correctly in AccessibilityWindowManager"
2019-11-25 03:59:19 +00:00
Rhed Jao
a7ac868de8
Merge "Accessibility shortcut improvement (4/n)"
2019-11-25 03:53:24 +00:00
Rhed Jao
9acdb42cc9
Merge "Fix legacy a11y service fail to update a11y button flag"
2019-11-25 03:52:45 +00:00
Howard Ro
4697c7f5e1
Merge "StatsEvent unit tests"
2019-11-25 03:12:27 +00:00
Jason Chiu
039a30fbd7
Merge "[SettingsLib] Support master switch of inline toggle of Settings Injection v2"
2019-11-25 02:36:08 +00:00
TreeHugger Robot
bc56ea3551
Merge "Add change ID for platform compat"
2019-11-25 00:23:58 +00:00
David Castro
5df37b4e9b
Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 am: 0c8d339950 am: b69d94a847
...
am: d52dd84fbf
2019-11-24 04:58:51 -08:00
Hai Shalom
f022baab71
[automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 65c9665125
...
am: f8a5719cfc5579604a1d
2019-11-24 04:56:39 -08:00
Roshan Pius
61069abccb
Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"
2019-11-24 06:57:07 +00:00
Jing Ji
bf7a155295
Wait for the dying app fully killed on getting content provider
...
If we are acquiring a content provider, but the hosting process
is dying, wait for its death notification come in, before
restart this process.
Bug: 141857656
Test: manual
Change-Id: Ib2a8014bb3f22485172d0574cfce14bc6895034b
2019-11-24 04:52:13 +00:00
Wale Ogunwale
847e67617e
Merge "Fix problem with clearing root activity during task reset"
2019-11-23 15:22:38 +00:00
Wale Ogunwale
89ce6b322a
Fix problem with clearing root activity during task reset
...
Problem introduced during code refactor.
Fixes: 145015624
Test: Camera launchs from home activity.
Change-Id: I9ed474471ccbcc333892301b06e79a58cef5a207
2019-11-22 22:17:09 -08:00
Shuo Qian
4aeff5ba6e
Merge "Introduce APIs for Emergency Number Database version"
2019-11-23 02:33:50 +00:00
TreeHugger Robot
da0af1203b
Merge "Remove UserUsageStatsService#userUnlocked."
2019-11-23 01:55:39 +00:00
TreeHugger Robot
276b49f758
Merge "Create empty PowerWhitelistManager."
2019-11-23 01:33:12 +00:00
TreeHugger Robot
cd79af4eec
Merge "Initial IME inline suggestions APIs"
2019-11-23 01:21:02 +00:00
TreeHugger Robot
da0dbcdb12
Merge "Remove call to setLayerStack for BlackFrame Surface"
2019-11-23 00:27:52 +00:00
Varun Shah
8958d5d0bc
Remove UserUsageStatsService#userUnlocked.
...
UsageStatsDatabase#init was being called twice every time - once when
the usage stats service was initialized and once when the user was
unlocked. However, this was unnecessary and doing duplicate work since
on user unlock, when the service is initialized, the database is also
initialized.
Bug: n/a
Test: atest UsageStatsTest
Change-Id: Ic74ba3ff8a0b68c97340ffe25b19065e1a046731
2019-11-22 16:14:24 -08:00
TreeHugger Robot
9711bbdd15
Merge "Change visibility of members in StatsEvent"
2019-11-23 00:08:52 +00:00
Sarah Chin
b63c1d95e4
Merge "Add NR to CellInfo"
2019-11-22 23:48:47 +00:00
Evan Rosky
1d650e941c
Merge "Add per-display Configuration change reporting"
2019-11-22 23:43:49 +00:00
