Tobias Thierer
241377b10a
Revert "MediaHTTPConnection: move connection states into an inner class"
...
This reverts commit 621e7968adf0253d5e22406f02ccc8bcc0eda5ec.
Many of the fields that were moved are annotated @UnsupportedAppUsage,
so the CL would have had undesirable app compat impact. Further,
because investigation has revealed that lock contention *is* possible,
we need to always acquire the lock anyway so there is no longer a
benefit in keeping all of the mutable state in a single field that
can be atomically set to null.
Bug: 114337214
Test: Treehugger
(cherry picked from commit dc9f4b4d5d28fc68b1b5e4e8500bf67d4b11621d)
Change-Id: I202c5653cb086d99228491e161a159bad640105a
Merged-In: I202c5653cb086d99228491e161a159bad640105a
2019-04-08 18:14:04 +00:00
TreeHugger Robot
dd07ae579c
Merge "Fix a possible crash when the listener is null" into qt-dev
2019-04-04 13:50:10 +00:00
Chalard Jean
2867145522
Fix a possible crash when the listener is null
...
Test: manual
Bug: 129930804
Change-Id: Id598ae1d98154b19d156e52973cf379669e7060c
2019-04-04 10:56:32 +00:00
TreeHugger Robot
0454f3b8ae
Merge "Force app to draw navigation bar background" into qt-dev
2019-04-04 09:24:31 +00:00
TreeHugger Robot
9ad8aa3ad6
Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev
2019-04-04 08:40:31 +00:00
Jorim Jaggi
a6aabacbb5
Force app to draw navigation bar background
...
For gestural navigation, having a small bar drawn by SystemUI
looks really really weird. Since we force the status bar
background to be drawn in the client, we can also force the
navigation bar background without expecting any compat issues.
Bug: 129751541
Test: Open legacy app, ensure black is drawn in the client
Change-Id: I9cd4c5dd799324ff10bf9d28750e8f238ab1e459
(cherry picked from commit 461bb11371e956ab1ab2e19940d393d9d729be54)
2019-04-04 07:27:10 +00:00
Yin-Chia Yeh
796820aa92
Merge "Camera: add QCIF resolution exception" into pi-dev
...
am: 5b09928b22
Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9
2019-04-04 00:14:38 -07:00
Rich Cannings
1ea0bce72a
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev
...
am: 9bdc35b2df -s ours
am skip reason: subject contains skip directive
Change-Id: Iec753dfc9cebc31463c427d5ad2bae47205ed11e
2019-04-04 00:06:47 -07:00
Rich Cannings
726b90f167
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
...
am: 157f05eb04 -s ours
am skip reason: subject contains skip directive
Change-Id: I33d588642ad1fb9a4820507f1ea39c9eccc0c9f8
2019-04-04 00:05:25 -07:00
Rubin Xu
f68a3a5891
[automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache
...
am: 567f2357f9 -s ours
am skip reason: subject contains skip directive
Change-Id: I6cd88a157c5de9109215ec52ecad66687446d2ab
2019-04-03 23:55:44 -07:00
Rich Cannings
2d53e9d2ab
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
...
am: 820b2504f3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia8e21b690d4966e3334db646d12bfe7e2bad4151
2019-04-03 23:53:40 -07:00
Matthew Ng
f03c3a6398
Ime in gestural mode will have ime switcher and down arrow
...
When in gestural mode, the navigation bar will inset the ime window
higher to raise up revealing the original height of the navigation bar.
In place will be the (alt) back button (pointing down), the handle and
ime switcher (if should be shown).
Fixes: 128928130
Bug: 113952590
Bug: 112934365
Test: manual
Change-Id: I28cc4def846cb09eb2d7ab00d12561f0c198dbbc
2019-04-04 06:39:26 +00:00
Xiangyu/Malcolm Chen
2fec69813c
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am: 63bf486921 am: 2cadf8e9f9
...
am: 3722b6907f -s ours
am skip reason: change_id Iaf004d6881964bd19072e9ef623f2e89f2529639 with SHA1 2e1f945a6c is in history
Change-Id: Ic1bf053d7233e1068aa3d2d5b4512e6626d9a4cf
2019-04-03 17:13:58 -07:00
Susi Kharraz-Post
0c70be6738
Merge "Add logging for direct share target"
2019-04-04 00:03:56 +00:00
Jack He
412e35af24
Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"
2019-04-04 00:01:16 +00:00
Lucas Dupin
96ec115e1a
Merge "Make KeyguardSliceView title tappable"
2019-04-04 00:00:23 +00:00
TreeHugger Robot
28a02ae862
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
2019-04-03 23:57:20 +00:00
TreeHugger Robot
d942bd1550
Merge "Disallow pruning system shared static libraries"
2019-04-03 23:57:10 +00:00
Xiangyu/Malcolm Chen
3722b6907f
Merge "Clean up a few names of Telephony intent extra." am: 63bf486921
...
am: 2cadf8e9f9
Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0
2019-04-03 16:49:33 -07:00
Kevin Chyn
9af1448d50
Merge "Make get/set feature async between settings and service"
2019-04-03 23:46:14 +00:00
Jack He
ac33c99889
Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged
...
Bug: 112969790
Test: make, test drive with statsd
Change-Id: Ic732d48b69799f241a0e96c159b06c778392d2bf
2019-04-03 23:45:32 +00:00
TreeHugger Robot
259c73c007
Merge "Move NetworkStatsFactory into service directory"
2019-04-03 23:44:26 +00:00
Bill Rassieur
d7ffb21343
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: bf3de50711
Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
2019-04-03 16:41:27 -07:00
Christine Franks
fc9fb21695
Merge "Reserve display white balance metric"
2019-04-03 23:37:32 +00:00
Shuo Qian
961cda0cb5
[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afacec am: 4362b01d2c
...
am: 47fdabe9fa -s ours
am skip reason: change_id If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c with SHA1 c6d55453ee is in history
Change-Id: I1f15c088f35ec60918c7296317969907c2699297
2019-04-03 16:28:45 -07:00
Xiangyu/Malcolm Chen
2cadf8e9f9
Merge "Clean up a few names of Telephony intent extra."
...
am: 63bf486921
Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1
2019-04-03 16:24:23 -07:00
Winson Chung
a39a07cf87
Merge "Differentiate the edge sensitivity from the edge panel size"
2019-04-03 23:24:07 +00:00
Lucas Dupin
6614ecc855
Merge "Delete unnecessary cache"
2019-04-03 23:15:50 +00:00
Shuo Qian
47fdabe9fa
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afacec
...
am: 4362b01d2c
Change-Id: I74e90fc150b6928e244a35aabeb865b6ad521810
2019-04-03 16:15:05 -07:00
Xiangyu/Malcolm Chen
63bf486921
Merge "Clean up a few names of Telephony intent extra."
2019-04-03 23:06:47 +00:00
TreeHugger Robot
ca3088a9aa
Merge "Add per-file owner for CursorWindow.cpp"
2019-04-03 23:05:48 +00:00
TreeHugger Robot
53f81a6800
Merge "Update default for silent-notifs-in-statusbar"
2019-04-03 23:05:21 +00:00
Shuo Qian
4362b01d2c
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
...
am: b8c7afacec
Change-Id: I5a41e63ee113447f75178bf3bfd996431046799a
2019-04-03 16:04:48 -07:00
Winson Chung
01ac1d0aab
Differentiate the edge sensitivity from the edge panel size
...
Bug: 129492856
Test: Swipe from edge
Change-Id: I3b2ce3dd6b3633da1f83c8943538f0f4af5ce481
2019-04-03 22:58:12 +00:00
Todd Kennedy
605d6b1d46
Merge "Return the update timestamp in getStagedSessions()"
2019-04-03 22:57:48 +00:00
TreeHugger Robot
088a61fb53
Merge "Audio: Check if BluetoothDevice.getName() returns null"
2019-04-03 22:44:10 +00:00
Winson Chung
099d3ae04b
Merge "Add logging callback for back action"
2019-04-03 22:40:47 +00:00
TreeHugger Robot
a5250b91b8
Merge "Another redesign of notification guts"
2019-04-03 22:36:34 +00:00
TreeHugger Robot
2ae133285b
Merge "Fix Global Actions animations, and use old power menu when panel is disabled. Also tweak feature flags setup to use old flag as a force option for debugging."
2019-04-03 22:36:29 +00:00
Christian Wailes
7df27e9e4e
Merge "Adds Zygote.initNativeState"
2019-04-03 22:35:35 +00:00
Lucas Dupin
ad07944c1e
Make KeyguardSliceView title tappable
...
Bug: 129877485
Test: manual with caldendar event
Change-Id: I413f9c92541f7b7d8ee8a766a43f3086b88aa7f8
2019-04-03 15:31:45 -07:00
George Lu
bda66f48c0
Merge "Implement AIDL fanout from v2 HAL BroadcastRadioService"
2019-04-03 22:30:03 +00:00
TreeHugger Robot
db7c25ad69
Merge "Add auto-mirror to help icon"
2019-04-03 22:28:29 +00:00
TreeHugger Robot
a6a688fefd
Merge "Add app compaction throttling."
2019-04-03 22:24:24 +00:00
Hyunyoung Song
b5e014a2fc
Merge "Fetch roundIcon|icon depending on RRO overlayed config_useRoundIcon"
2019-04-03 22:18:35 +00:00
Shuo Qian
b8c7afacec
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
2019-04-03 22:18:31 +00:00
Chen Xu
1ec46998a0
Merge "SDK API doesSwitchModemConfigTriggerReboot"
2019-04-03 22:17:47 +00:00
Jeff Sharkey
b2a4176903
Merge "Temporary hack until we have dynamic remounting."
2019-04-03 22:17:08 +00:00
TreeHugger Robot
1f616bc492
Merge "Move product only fonts out of AOSP."
2019-04-03 22:14:48 +00:00
Winson
4a3170a43c
Disallow pruning system shared static libraries
...
Shared libraries on the system image are assumed to always exist,
so do not prune them to free storage space.
Also fixes invalid uses of PackageSettingBase#getUserState
Bug: 128426859
Test: atest StaticSharedLibsHostTests
Test: atest EphemeralTest
Change-Id: I096749af6d7a5916ced433df60a33e2d5b8a7975
2019-04-03 22:08:12 +00:00