OSDN Git Service
paulhu [Thu, 4 Apr 2019 07:57:26 +0000 (00:57 -0700)]
Merge "Fix ConnectivityServiceTest fail." am:
fa8fc65340
am:
ccc12f673b
Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e
Jack Yu [Thu, 4 Apr 2019 07:48:06 +0000 (00:48 -0700)]
[automerger skipped] Merge "Removed data and voice RAT from service state" am:
ced4a31769
am:
279a924fdf -s ours
am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1
5ff5ab5649 is in history
Change-Id: Ibdc66cdfee886cebd29f4f023eaa02e8b5ea8d8f
Yin-Chia Yeh [Thu, 4 Apr 2019 07:34:05 +0000 (00:34 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev am:
5b09928b22
am:
796820aa92
Change-Id: Ie4c3901832ef4808db0428a0825c1673c9334f07
Rich Cannings [Thu, 4 Apr 2019 07:28:27 +0000 (00:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am:
9bdc35b2df -s ours
am:
1ea0bce72a
Change-Id: Ica00080cedab5e38e3930b5a3b347dc636fe020a
Rich Cannings [Thu, 4 Apr 2019 07:22:42 +0000 (00:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am:
157f05eb04 -s ours
am:
726b90f167
Change-Id: I4cb8f0000b765ce9b241ecda5d64c852ab547ee8
Yin-Chia Yeh [Thu, 4 Apr 2019 07:14:38 +0000 (00:14 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev
am:
5b09928b22
Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9
Rubin Xu [Thu, 4 Apr 2019 07:12:41 +0000 (00:12 -0700)]
[automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache am:
567f2357f9 -s ours
am:
f68a3a5891
Change-Id: I05f2975b0bc81c5628a0e7bee7328d41526c74f8
Rich Cannings [Thu, 4 Apr 2019 07:08:00 +0000 (00:08 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am:
820b2504f3 -s ours
am:
2d53e9d2ab
Change-Id: I22884779bd6b3432374ddc52c742e2703d5ad5dd
Rich Cannings [Thu, 4 Apr 2019 07:06:47 +0000 (00:06 -0700)]
[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
Rich Cannings [Thu, 4 Apr 2019 07:05:25 +0000 (00:05 -0700)]
[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
Rubin Xu [Thu, 4 Apr 2019 06:55:44 +0000 (23:55 -0700)]
[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
Rich Cannings [Thu, 4 Apr 2019 06:53:40 +0000 (23:53 -0700)]
[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
paulhu [Thu, 4 Apr 2019 00:24:39 +0000 (17:24 -0700)]
Merge "Fix ConnectivityServiceTest fail."
am:
fa8fc65340
Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
Xiangyu/Malcolm Chen [Thu, 4 Apr 2019 00:13:58 +0000 (17:13 -0700)]
[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
Jack Yu [Thu, 4 Apr 2019 00:13:45 +0000 (17:13 -0700)]
Merge "Removed data and voice RAT from service state"
am:
ced4a31769
Change-Id: I2ef8a5d4647d404d5b782e78c8ab2613f6466f92
Susi Kharraz-Post [Thu, 4 Apr 2019 00:03:56 +0000 (00:03 +0000)]
Merge "Add logging for direct share target"
Jack He [Thu, 4 Apr 2019 00:01:16 +0000 (00:01 +0000)]
Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"
Lucas Dupin [Thu, 4 Apr 2019 00:00:23 +0000 (00:00 +0000)]
Merge "Make KeyguardSliceView title tappable"
TreeHugger Robot [Wed, 3 Apr 2019 23:57:20 +0000 (23:57 +0000)]
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
TreeHugger Robot [Wed, 3 Apr 2019 23:57:10 +0000 (23:57 +0000)]
Merge "Disallow pruning system shared static libraries"
Treehugger Robot [Wed, 3 Apr 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Fix ConnectivityServiceTest fail."
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:49:33 +0000 (16:49 -0700)]
Merge "Clean up a few names of Telephony intent extra." am:
63bf486921
am:
2cadf8e9f9
Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0
Kevin Chyn [Wed, 3 Apr 2019 23:46:14 +0000 (23:46 +0000)]
Merge "Make get/set feature async between settings and service"
Jack He [Wed, 3 Apr 2019 23:08:21 +0000 (16:08 -0700)]
Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Ic732d48b69799f241a0e96c159b06c778392d2bf
TreeHugger Robot [Wed, 3 Apr 2019 23:44:26 +0000 (23:44 +0000)]
Merge "Move NetworkStatsFactory into service directory"
Bill Rassieur [Wed, 3 Apr 2019 23:41:27 +0000 (16:41 -0700)]
Merge master@
5406228 into git_qt-dev-plus-aosp.
am:
bf3de50711
Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
Jack Yu [Wed, 3 Apr 2019 23:39:24 +0000 (23:39 +0000)]
Merge "Removed data and voice RAT from service state"
Christine Franks [Wed, 3 Apr 2019 23:37:32 +0000 (23:37 +0000)]
Merge "Reserve display white balance metric"
Shuo Qian [Wed, 3 Apr 2019 23:28:45 +0000 (16:28 -0700)]
[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
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:24:23 +0000 (16:24 -0700)]
Merge "Clean up a few names of Telephony intent extra."
am:
63bf486921
Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1
Winson Chung [Wed, 3 Apr 2019 23:24:07 +0000 (23:24 +0000)]
Merge "Differentiate the edge sensitivity from the edge panel size"
Lucas Dupin [Wed, 3 Apr 2019 23:15:50 +0000 (23:15 +0000)]
Merge "Delete unnecessary cache"
Shuo Qian [Wed, 3 Apr 2019 23:15:05 +0000 (16:15 -0700)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am:
b8c7afacec
am:
4362b01d2c
Change-Id: I74e90fc150b6928e244a35aabeb865b6ad521810
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
TreeHugger Robot [Wed, 3 Apr 2019 23:05:48 +0000 (23:05 +0000)]
Merge "Add per-file owner for CursorWindow.cpp"
TreeHugger Robot [Wed, 3 Apr 2019 23:05:21 +0000 (23:05 +0000)]
Merge "Update default for silent-notifs-in-statusbar"
Shuo Qian [Wed, 3 Apr 2019 23:04:48 +0000 (16:04 -0700)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
am:
b8c7afacec
Change-Id: I5a41e63ee113447f75178bf3bfd996431046799a
Winson Chung [Mon, 1 Apr 2019 20:39:21 +0000 (13:39 -0700)]
Differentiate the edge sensitivity from the edge panel size
Bug:
129492856
Test: Swipe from edge
Change-Id: I3b2ce3dd6b3633da1f83c8943538f0f4af5ce481
Todd Kennedy [Wed, 3 Apr 2019 22:57:48 +0000 (22:57 +0000)]
Merge "Return the update timestamp in getStagedSessions()"
TreeHugger Robot [Wed, 3 Apr 2019 22:44:10 +0000 (22:44 +0000)]
Merge "Audio: Check if BluetoothDevice.getName() returns null"
Winson Chung [Wed, 3 Apr 2019 22:40:47 +0000 (22:40 +0000)]
Merge "Add logging callback for back action"
TreeHugger Robot [Wed, 3 Apr 2019 22:36:34 +0000 (22:36 +0000)]
Merge "Another redesign of notification guts"
TreeHugger Robot [Wed, 3 Apr 2019 22:36:29 +0000 (22:36 +0000)]
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."
Christian Wailes [Wed, 3 Apr 2019 22:35:35 +0000 (22:35 +0000)]
Merge "Adds Zygote.initNativeState"
Lucas Dupin [Wed, 3 Apr 2019 20:14:11 +0000 (13:14 -0700)]
Make KeyguardSliceView title tappable
Bug:
129877485
Test: manual with caldendar event
Change-Id: I413f9c92541f7b7d8ee8a766a43f3086b88aa7f8
George Lu [Wed, 3 Apr 2019 22:30:03 +0000 (22:30 +0000)]
Merge "Implement AIDL fanout from v2 HAL BroadcastRadioService"
TreeHugger Robot [Wed, 3 Apr 2019 22:28:29 +0000 (22:28 +0000)]
Merge "Add auto-mirror to help icon"
Jack Yu [Tue, 2 Apr 2019 20:14:03 +0000 (13:14 -0700)]
Removed data and voice RAT from service state
The voice and data RAT are now derived from
CS and PS network registration info.
Test: Manual + unit tests
Bug:
129863444
Merged-In: I3f4cb6057a4ae821363099583eeac7c867147afb
Change-Id: I3f4cb6057a4ae821363099583eeac7c867147afb
(cherry picked from commit
5ff5ab5649644eded4f662303fdacee08aaad044)
TreeHugger Robot [Wed, 3 Apr 2019 22:24:24 +0000 (22:24 +0000)]
Merge "Add app compaction throttling."
Hyunyoung Song [Wed, 3 Apr 2019 22:18:35 +0000 (22:18 +0000)]
Merge "Fetch roundIcon|icon depending on RRO overlayed config_useRoundIcon"
Shuo Qian [Wed, 3 Apr 2019 22:18:31 +0000 (22:18 +0000)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
Chen Xu [Wed, 3 Apr 2019 22:17:47 +0000 (22:17 +0000)]
Merge "SDK API doesSwitchModemConfigTriggerReboot"
Jeff Sharkey [Wed, 3 Apr 2019 22:17:08 +0000 (22:17 +0000)]
Merge "Temporary hack until we have dynamic remounting."
TreeHugger Robot [Wed, 3 Apr 2019 22:14:48 +0000 (22:14 +0000)]
Merge "Move product only fonts out of AOSP."
Winson [Tue, 26 Mar 2019 18:39:46 +0000 (11:39 -0700)]
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
TreeHugger Robot [Wed, 3 Apr 2019 22:06:55 +0000 (22:06 +0000)]
Merge "Fix NPE in RNA#callOnFinished"
TreeHugger Robot [Wed, 3 Apr 2019 22:03:51 +0000 (22:03 +0000)]
Merge "MultiUserPerfTest - test restart profile"
Jack Yu [Wed, 3 Apr 2019 22:02:30 +0000 (22:02 +0000)]
Merge "Removed data and voice RAT from service state"
TreeHugger Robot [Wed, 3 Apr 2019 21:56:39 +0000 (21:56 +0000)]
Merge "Add support for /odm/overlay"
Susi Kharraz-Post [Mon, 1 Apr 2019 15:07:59 +0000 (11:07 -0400)]
Add logging for direct share target
To answer the question if users share mainly with 1 or 2 direct targets
or with a multitude of contacts, we need to log the direct target +
package name. For privacy, this gets hashed with a salt that expires by
default every 7 days. The PH flag will allow us to change the expiration
time if we obtain PWG permission for that.
Bug:
126365511
Test: New test in ChooserActivityTest + manual testing of consistency
and flag rollout using adb shell device_config put systemui
hash_salt_max_days with multiple values
Change-Id: Ib4255b3eb39ca91ccb5803dc036ffe0ea83a27c9
Christine Franks [Thu, 28 Mar 2019 18:47:00 +0000 (11:47 -0700)]
Reserve display white balance metric
Bug:
123930917
Test: n/a
Change-Id: Ieb7fb22566dee89b9128756ec2e2c06cc0211f9a
TreeHugger Robot [Wed, 3 Apr 2019 21:47:38 +0000 (21:47 +0000)]
Merge "Don't show the dismiss target if trying to drag the flyout."
Eric Biggers [Wed, 3 Apr 2019 21:38:28 +0000 (21:38 +0000)]
Merge "With native FBE, lock user directories when framework is started"
TreeHugger Robot [Wed, 3 Apr 2019 21:34:44 +0000 (21:34 +0000)]
Merge "MultiUserPerfTest test switch to pre-existing user"
Makoto Onuki [Wed, 3 Apr 2019 21:32:35 +0000 (14:32 -0700)]
Add per-file owner for CursorWindow.cpp
(Need to merge it first to avoid merge conflict)
Test: N/A
Change-Id: I075ac3ec47743f5d9cd2acbd0cc01ce55cd1a8e3
sqian [Tue, 2 Apr 2019 02:26:18 +0000 (19:26 -0700)]
Modify the deprecation of PhoneNumberUtil isEmergencyNumber
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.
Test: Manual
Fixes:
129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
Merged-In: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c
(cherry picked from commit
c6d55453ee9a4c352be873eb73c4ec433be11faf)
Chenbo Feng [Fri, 1 Mar 2019 23:07:24 +0000 (15:07 -0800)]
Move NetworkStatsFactory into service directory
In order to notify netd to swap eBPF maps before pulling the
networkStats from eBPF maps, NetworkStatsFactory need to use the
NetdServices to issue binder calls. So it need to be moved from
framework/base/core to framework/base/service since object in
framework/base/core cannot get any system services. This change is also
necessary for setting up a lock inside NetworkStatsFactory to prevent
racing between two netstats caller since the lock need to be hold before
netd trigger the map swap.
Also fix the compile problem caused by moving the NetworkStatsFactory
and the related tests. Rename the packages and the jni functions to a
more proper name.
Bug:
124764595
Bug:
128900919
Test: NetworkStatsFactoryTest
android.app.usage.cts.NetworkUsageStatsTest
android.net.cts.TrafficStatsTest
Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
Jiuyu Sun [Wed, 3 Apr 2019 21:24:45 +0000 (21:24 +0000)]
Merge "Check cardId in EuiccManager#isEnabled."
Shuo Qian [Wed, 3 Apr 2019 21:23:44 +0000 (21:23 +0000)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber"
Nicolas Geoffray [Wed, 3 Apr 2019 21:22:03 +0000 (14:22 -0700)]
Merge "Use Class.forName instead of ClassLoader.loadClass." am:
dc489aba0e am:
1b7fb8f7ae
am:
cb6605192c
Change-Id: I953c2bb97dda4ca654e552d58bf56d884d609fc0
TreeHugger Robot [Wed, 3 Apr 2019 21:18:17 +0000 (21:18 +0000)]
Merge "Add AudioAttribute flag missing in FLAG_ALL"
TreeHugger Robot [Wed, 3 Apr 2019 21:11:44 +0000 (21:11 +0000)]
Merge "Update the system font implementation for new API change"
TreeHugger Robot [Wed, 3 Apr 2019 21:10:31 +0000 (21:10 +0000)]
Merge changes Iaad5b04d,Ic810dda6
* changes:
Add null check before setting min size
Remove assist capture on swipe up
Android Build Merger (Role) [Wed, 3 Apr 2019 21:03:32 +0000 (21:03 +0000)]
Merge "[automerger skipped] Merge "libmedia2_jni: link to libcgrouprc" am:
847de83188 am:
751f3484ed am:
de2654be88 -s ours am skip reason: change_id Ieebba36417d1f83a5946f927043f15dc8abc188a with SHA1
f7cbc11d0c is in history"
Yifan Hong [Wed, 3 Apr 2019 20:54:58 +0000 (13:54 -0700)]
[automerger skipped] Merge "libmedia2_jni: link to libcgrouprc" am:
847de83188 am:
751f3484ed
am:
de2654be88 -s ours
am skip reason: change_id Ieebba36417d1f83a5946f927043f15dc8abc188a with SHA1
f7cbc11d0c is in history
Change-Id: I6d7adf483a51c120be3b16aa780c50bd20b83656
Alex Salo [Wed, 3 Apr 2019 20:54:57 +0000 (20:54 +0000)]
Merge "Notify caller about cancellation"
Michael Groover [Wed, 3 Apr 2019 20:54:17 +0000 (20:54 +0000)]
Merge "Remove 'Sensors Off' tile as it is now a developer QS tile"
Android Build Merger (Role) [Wed, 3 Apr 2019 20:47:26 +0000 (20:47 +0000)]
Merge "[automerger skipped] Merge "Convert Android.mk file to Android.bp" am:
e6bcf626be am:
7f0a256a78 am:
e280e2e614 -s ours am skip reason: change_id I92f7584aeaf502336f67e04fbc22634784c9305d with SHA1
b61bab6a58 is in history"
Sasha Smundak [Wed, 3 Apr 2019 20:46:57 +0000 (13:46 -0700)]
[automerger skipped] Merge "Convert Android.mk file to Android.bp" am:
e6bcf626be am:
7f0a256a78
am:
e280e2e614 -s ours
am skip reason: change_id I92f7584aeaf502336f67e04fbc22634784c9305d with SHA1
b61bab6a58 is in history
Change-Id: If1e555e8549034a31fa346b7b81aac30231e9e74
TreeHugger Robot [Wed, 3 Apr 2019 20:44:32 +0000 (20:44 +0000)]
Merge "Deprecate runOnBinderBlocking()"
Chris Wailes [Wed, 3 Apr 2019 20:00:52 +0000 (13:00 -0700)]
Adds Zygote.initNativeState
This patch replaces three seperate native initialization functions with
a single function, reducing the number of times we need to cross the JNI
boundary. In addition this loads an empty performance profile for the
zygote to address b/
129704892.
Bug:
129704892
Test: make & boot
Test: Treehugger
Change-Id: I0413f554e0963a714e0b4de3196d31ffe6775a3a
TreeHugger Robot [Wed, 3 Apr 2019 20:41:21 +0000 (20:41 +0000)]
Merge "Refactor PowerWhitelistBackend"
Jack He [Wed, 3 Apr 2019 07:48:49 +0000 (00:48 -0700)]
Audio: Check if BluetoothDevice.getName() returns null
* BluetoothDevice.getName() could return null if Bluetooth process
is not running. This patch uses empty string "" to replace the null
value returned from BluetoothDevice.getName(). The logic is wrapped
in BtHelper#getName(BluetoothDevice) method
Fixes:
129806133
Test: atest BluetoothInstrumentationTests on eng build
Change-Id: If44e675aafa779fa86451742aa917404987fc15a
Aaron Heuckroth [Tue, 2 Apr 2019 18:21:57 +0000 (14:21 -0400)]
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.
Test: Automated tests pass. Long-press power menu without plugin installed from different device orientations -- menu should animate in from the closest screen edge in all orientations and rotate correctly when device is rotated. Repeat after enabling the settings_global_actions_force_grid_enabled option in Feature Flags to ensure the correct behavior persists when using the new grid layout.
Fixes:
126444760
Fixes:
129698948
Change-Id: I9ac387244a5904f832c5d8b6c40362c00c6a22a2
TreeHugger Robot [Wed, 3 Apr 2019 20:31:10 +0000 (20:31 +0000)]
Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp"
TreeHugger Robot [Wed, 3 Apr 2019 20:30:17 +0000 (20:30 +0000)]
Merge "Add com.android.keyguard to LOCAL_JACK_COVERAGE_INCLUDE_FILTER."
TreeHugger Robot [Wed, 3 Apr 2019 20:26:44 +0000 (20:26 +0000)]
Merge "Adding some helper methods in QuickstepContract"
Jeff Sharkey [Wed, 3 Apr 2019 20:21:42 +0000 (14:21 -0600)]
Temporary hack until we have dynamic remounting.
We're stuck in a place where we've half-implemented our storage
mounting and remounting story, so the mount mode is locked in for
the lifetime of the process.
The safest way to get this working for the next beta cut is to
always assume the app has the permissions they request, and we'll
follow up with a STOPSHIP to get a real fix in place.
Bug:
129744277
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: If152c52d3630112547f4d3e7a07449da452550fd
Nicolas Geoffray [Wed, 3 Apr 2019 20:14:39 +0000 (13:14 -0700)]
Merge "Use Class.forName instead of ClassLoader.loadClass." am:
dc489aba0e
am:
1b7fb8f7ae
Change-Id: I41141b6fc6934faf086ea930b19539a0daba8298
Daniel Sandler [Wed, 3 Apr 2019 20:07:38 +0000 (20:07 +0000)]
Merge "Proper package icon for Q SystemUI."
Chavi Weingarten [Wed, 3 Apr 2019 20:05:59 +0000 (20:05 +0000)]
Merge "Ensure input transactions are applied before injecting input"
Zhi An Ng [Wed, 3 Apr 2019 20:04:58 +0000 (20:04 +0000)]
Merge "Fix am start -S <package>"
Ryan Mitchell [Wed, 3 Apr 2019 20:04:41 +0000 (20:04 +0000)]
Merge changes from topic "rro-cts"
* changes:
RRO CTS Test APIs
Relax restrictions on non-system overlays
TreeHugger Robot [Wed, 3 Apr 2019 20:04:32 +0000 (20:04 +0000)]
Merge "Fix idmap2 policy concatenation"
Ng Zhi An [Tue, 2 Apr 2019 16:00:22 +0000 (09:00 -0700)]
Fix am start -S <package>
Previously, am start <package> and am start -S <package> had different
behaviors because the -S code path did not convert the default user id
(by calling handleIncomingUser) into a proper userId that is uses for
querying intent activities.
The default user id is converted in other code paths, so we do not
convert it inside of makeIntent, but only in the mStopOption path, right
before queryIntentActivities.
Test: adb shell am start -S com.android.chrome
Test: adb shell run-as com.example.zhin am start
(same as P)
IllegalArgumentException: No intent supplied
Test: adb shell run-as com.example.zhin am start com.example.zhin
(same as P)
Security exception: Permission Denial: startActivityAsUser asks to run as user
-2 but is calling from uid u0a193; this requires
android.permission.INTERACT_ACROSS_USERS_FULL
Test: adb shell run-as com.example.zhin am start --user 0 com.example.zhin
(same as P)
Starting: Intent { act=android.intent.action.MAIN
cat=[android.intent.category.LAUNCHER] pkg=com.example.zhin }
Error: Activity not started, unable to resolve Intent {
act=android.intent.action.MAIN cat=[android.intent.category.LAUNCHER]
flg=0x10000000 pkg=com.example.zhin }
Bug:
129712542
Change-Id: I3ce6ffd40fd834bffd28b4440c1fb0024c799d95
Chavi Weingarten [Wed, 3 Apr 2019 19:59:24 +0000 (19:59 +0000)]
Merge "Add onPointerDownOutsideFocus for events outside the focused window (4/4)"
Jean-Michel Trivi [Wed, 3 Apr 2019 19:58:59 +0000 (19:58 +0000)]
Merge "PlayerBase: conditional muting on OP_PLAY_AUDIO changes"
Chalard Jean [Wed, 3 Apr 2019 19:58:46 +0000 (19:58 +0000)]
Merge "Straighten AIDL interface for the memory store"
Joshua Tsuji [Wed, 3 Apr 2019 19:15:19 +0000 (15:15 -0400)]
Don't show the dismiss target if trying to drag the flyout.
Also, make dragging the flyout a no-op until the gesture is added. Tapping still expands the bubbles.
Test: manual
Change-Id: Ida96465e3db923e0b08a0cf0cf41dd97cddbe606
sqian [Tue, 2 Apr 2019 02:26:18 +0000 (19:26 -0700)]
Modify the deprecation of PhoneNumberUtil isEmergencyNumber
1) Telephony API is still called by a bunch of Util methods in Android that
don't have context, therefore the service can be null. Throwing an
exception can cause crash.
2) Fix the usage of isEmergencyNumber and isPotentialEmergencyNumber.
Test: Manual
Fixes:
129721537
Change-Id: If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c