Commit Graph

413680 Commits

Author SHA1 Message Date
Hyundo Moon
f787fac162 Merge "MediaSessionService: Log more info on volume key event" into qt-dev
am: db54f27d0a

Change-Id: I3ab37e85f2906595a82c48b6775f90767e32de3c
2019-04-10 04:40:55 -07:00
TreeHugger Robot
db54f27d0a Merge "MediaSessionService: Log more info on volume key event" into qt-dev 2019-04-10 11:21:34 +00:00
Chiachang Wang
d761fe8e24 [automerger skipped] Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" into qt-dev
am: 60cc2ab6e7 -s ours
am skip reason: change_id I1b26dc64eaab2151e6885fd01cc5e8d4e18c4e60 with SHA1 da48f0f6d3 is in history

Change-Id: I23657309145be45306d2df70dcc517e4c36a82a1
2019-04-10 04:14:11 -07:00
Chiachang Wang
60cc2ab6e7 Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" into qt-dev 2019-04-10 10:55:06 +00:00
Android Build Merger (Role)
41c346c3c8 Merge "Merge "Restrict updatable-media to android.media package." into qt-dev am: 38c298ac32" into qt-dev-plus-aosp 2019-04-10 09:58:12 +00:00
Vladimir Marko
adca64548d Merge "Restrict updatable-media to android.media package." into qt-dev
am: 38c298ac32

Change-Id: I6c44e8bca70091e01c782bed80f58ed117a66720
2019-04-10 02:57:44 -07:00
Lorenzo Colitti
bb41c8f751 Merge "Add lifecycle tests to NetworkMonitorTest" am: 047940eff0
am: 7509e6e5a1

Change-Id: Ib4b6084c4969d9e99ba338c558a41fd56c0e9024
2019-04-10 02:57:17 -07:00
Lorenzo Colitti
7509e6e5a1 Merge "Add lifecycle tests to NetworkMonitorTest"
am: 047940eff0

Change-Id: Ifdf54cf403c5038e666bce346287a5909102a946
2019-04-10 02:46:48 -07:00
Vladimir Marko
38c298ac32 Merge "Restrict updatable-media to android.media package." into qt-dev 2019-04-10 09:46:32 +00:00
Lorenzo Colitti
047940eff0 Merge "Add lifecycle tests to NetworkMonitorTest" 2019-04-10 09:30:03 +00:00
Louis Chang
adfd36a582 Merge "Fix Launcher crash while handling top resumed state" into qt-dev
am: e777220a38

Change-Id: Icb7216ba854644980cec4c9e89f7dac8636afe4d
2019-04-10 02:28:22 -07:00
TreeHugger Robot
e777220a38 Merge "Fix Launcher crash while handling top resumed state" into qt-dev 2019-04-10 09:07:35 +00:00
Kevin Chyn
858049a622 Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev
am: 76d5454a86

Change-Id: I1c6d9c51e6af91a79bf34d4d7245f758993a365e
2019-04-10 01:47:21 -07:00
Kevin Chyn
76d5454a86 Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev 2019-04-10 08:34:34 +00:00
Narayan Kamath
7b6e77a063 [automerger skipped] Merge "Shell: Grant CACHE_CONTENT to Shell" am: dd2e005d2f
am: 55a06bb5d1 -s ours
am skip reason: change_id I5eb72772a0a35897611dd6db95c68a2d2e971e9a with SHA1 a31ed1bbdd is in history

Change-Id: I1bf9f453e7a9d254d09286d054948ef4fbe3557c
2019-04-10 01:32:03 -07:00
Mårten Kongstad
53903a8e74 Merge "Remove overlay logic from package manager and parser" into qt-dev
am: 4777281cf4

Change-Id: I599c029ba465665aa705fdfef0fcc053d2eff49e
2019-04-10 01:25:31 -07:00
Narayan Kamath
55a06bb5d1 Merge "Shell: Grant CACHE_CONTENT to Shell"
am: dd2e005d2f

Change-Id: I5a409357fa9a4acd2cc7cbdf707b7388557e8643
2019-04-10 01:20:37 -07:00
TreeHugger Robot
4777281cf4 Merge "Remove overlay logic from package manager and parser" into qt-dev 2019-04-10 07:59:42 +00:00
Narayan Kamath
dd2e005d2f Merge "Shell: Grant CACHE_CONTENT to Shell" 2019-04-10 07:57:27 +00:00
Priyank Singh
b13ed0966a Merge "Adding a new dimension in dimens_car.xml for the spacer between title and message in a dialog." into qt-dev
am: 36844cc4b8

Change-Id: I5f8d36168eac22c7b2757dbf2e3a74cbd958005d
2019-04-10 00:36:58 -07:00
TreeHugger Robot
36844cc4b8 Merge "Adding a new dimension in dimens_car.xml for the spacer between title and message in a dialog." into qt-dev 2019-04-10 07:24:34 +00:00
Android Build Merger (Role)
d084c945d1 Merge "Merge "Fix comment on StaticIpConfiguration#getDomains" am: a1e48f3c9a am: 76de94e78c" into qt-dev-plus-aosp 2019-04-10 07:07:34 +00:00
Remi NGUYEN VAN
7d3313b5f9 Merge "Fix comment on StaticIpConfiguration#getDomains" am: a1e48f3c9a
am: 76de94e78c

Change-Id: I6a2ff0368193aaa988585613d99662a01cf4fa26
2019-04-10 00:07:05 -07:00
Shawn Lin
9109392768 Merge "Fixed jarring touch ripple effect when turning on/off battery saver from quick settings" into qt-dev
am: 2acef42df6

Change-Id: I157aae4d497c6abafda30549bbc4dfc794b8a6a8
2019-04-10 00:06:54 -07:00
Chenbo Feng
1b2d3c7c54 Merge "Add smoke test for jni library" am: b0b166054d
am: 6a9b888b52

Change-Id: Iba607c906917017f79f141f4e0599a2330cc0f14
2019-04-10 00:01:28 -07:00
Remi NGUYEN VAN
76de94e78c Merge "Fix comment on StaticIpConfiguration#getDomains"
am: a1e48f3c9a

Change-Id: Ia664b08eabe344470a5c08e5510f1a8f7132ac73
2019-04-09 23:54:09 -07:00
Lucas Dupin
0b385deef6 Merge "Always show error messages on bouncer" into qt-dev
am: c8d2c71723

Change-Id: I66e87ff247c8458bdc9c733977d5388e122ada23
2019-04-09 23:51:43 -07:00
Chenbo Feng
6a9b888b52 Merge "Add smoke test for jni library"
am: b0b166054d

Change-Id: Iedb44739539f63090b067c1a25d4e83c333caddb
2019-04-09 23:50:10 -07:00
Shawn Lin
2acef42df6 Merge "Fixed jarring touch ripple effect when turning on/off battery saver from quick settings" into qt-dev 2019-04-10 06:49:12 +00:00
Chiachang Wang
bd92d1539f Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces
ConnectivityManager and its usages are removed from
NetworkStatsService. After that, forceUpdateIfaces requires
information that only ConnectivityService has, hence
restricting the calling permission to NETWORK_STACK or
MAINLINE_NETWORK_STACK permission. The required permission
will be changed from READ_NETWORK_USAGE_HISTORY to
NETWORK_STACK or MAINLINE_NETWORK_STACK. This change would make
it impossible to call outside the system.

Bug: 126830974
Test: atest FrameworksNetTests
Merged-In: I1b26dc64eaab2151e6885fd01cc5e8d4e18c4e60
Change-Id: I4ea421e4126a45f65d25fe0bec74243a3b20aeab
(cherry picked from commit 6b895dea25)
2019-04-10 06:36:55 +00:00
TreeHugger Robot
c8d2c71723 Merge "Always show error messages on bouncer" into qt-dev 2019-04-10 06:35:32 +00:00
Yohei Yukawa
ef94a2ab33 Avoid exception from 'adb shell ime enable/disable'
am: 3d3abd2c7b

Change-Id: Ibf0bbf9600e6bb8fb8b35df6650bbf364cf8e690
2019-04-09 23:33:54 -07:00
Treehugger Robot
a1e48f3c9a Merge "Fix comment on StaticIpConfiguration#getDomains" 2019-04-10 06:30:55 +00:00
Treehugger Robot
b0b166054d Merge "Add smoke test for jni library" 2019-04-10 06:30:26 +00:00
Yohei Yukawa
3d3abd2c7b Avoid exception from 'adb shell ime enable/disable'
This is a preparation to introduce CTS for per-profile IME.

Currently
  adb shell ime enable <ime id>
and
  adb shell ime disable <ime id>
can throw IllegalArgumentException when <ime id> is not recognized by
the system.  This makes some sense, but if we start supporting
'-u all' option it'd make more sense if it just shows an error message
rather than letting the command crash with throing an exception.

This behavior change also removes a limitation that developers cannot
use
  adb shell ime disable <ime id>
command to remove an IME ID from Settings.Secure.ENABLED_INPUT_METHODS
if that IME is not currently installed.

Bug: 120784635
Test: Manually verified as follows.
  1. Build aosp_blueline-userdebug and flash it
  2. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
     -> "Unknown input method <IME ID here> cannot be enabled"
  3. adb shell ime disable com.example.android.softkeyboard/.SoftKeyboard
     -> "Input method <IME ID here>: already disabled"
Change-Id: Ib9be7700557f2f606c90d62f79ec3afca2f82c40
2019-04-09 23:20:12 -07:00
Svet Ganov
3f83f9d767 Merge "Clear calling identity before calling in package managerwq" into qt-dev
am: 10f383b32c

Change-Id: Ifecee8a75bbbcbf2678cc31c2b4c66e7c1b57dba
2019-04-09 22:58:37 -07:00
TreeHugger Robot
10f383b32c Merge "Clear calling identity before calling in package managerwq" into qt-dev 2019-04-10 05:36:43 +00:00
SongFerng Wang
1627b8e2dc Merge "Add 5G evolution icon" into qt-dev
am: 21df04365d

Change-Id: I146fecb6422a934a6bf1277959dd4afcea1b1031
2019-04-09 22:09:30 -07:00
Kevin Chyn
5a90a653f5 Handle cancellation properly for setDeviceCredentialAllowed(true)
Keep the current auth session until ConfirmDeviceCredential succeeds
or fails. ConfirmDeviceCredential's BP and LSKF screens can be canceled
now.

Bug: 123378871
Bug: 128747871

Test: With modified BiometricPromptDemo, ConfirmDeviceCredential's
      BiometricPrompt and LSKF screens can be canceled

Change-Id: Icaf3f0c55b07fd138a2ee9d214941ea83408f0ee
2019-04-09 22:04:05 -07:00
Android Build Merger (Role)
d60c1397bb Merge "Merge "Update version numbers to 0210000000" into qt-dev am: 9800d82743" into qt-dev-plus-aosp 2019-04-10 04:59:20 +00:00
Akshay Thakker
e19bd90b87 Merge "Update version numbers to 0210000000" into qt-dev
am: 9800d82743

Change-Id: I996cd2c48fe24e7c31cad915d4d14a5e96504ec7
2019-04-09 21:56:24 -07:00
Android Build Merger (Role)
edf067513e Merge "Merge "Add AlbumColumns.ARTIST_ID." into qt-dev am: 9cbf23f121" into qt-dev-plus-aosp 2019-04-10 04:48:42 +00:00
Chiachang Wang
0cf67baa1b [automerger skipped] Merge "Move data stall definitions out from Setting" am: e9a39ceb6b
am: 3b4698c39c -s ours
am skip reason: change_id I8e1fb5b47fff3bf624131ba1f5732daabd991e6d with SHA1 0b98441205 is in history

Change-Id: I66537498ead2d600efa38c5e7207f13d07943d8d
2019-04-09 21:43:25 -07:00
Jeff Sharkey
873f3481f3 Merge "Add AlbumColumns.ARTIST_ID." into qt-dev
am: 9cbf23f121

Change-Id: Ia4f1da6a5be9e5665f23a16b24393206331718b7
2019-04-09 21:34:06 -07:00
Etan Cohen
751c278195 Merge "[AWARE] Enable discovery/operation on 5G" into qt-dev
am: 05777f1abf

Change-Id: I4871309e90f66435da339f65b7c941febd4b8882
2019-04-09 21:28:35 -07:00
Jean-Michel Trivi
1cc427460d Merge "AudioService: fix broadcast of ACTION_SPEAKERPHONE_STATE_CHANGED" into qt-dev
am: 95baff256e

Change-Id: I1ebdc70bc96285833232a204cdc4408f9fc53a07
2019-04-09 21:23:25 -07:00
Shuo Qian
d369a4152c [automerger skipped] Merge "Use Received Uri as Gateway Uri" into qt-dev
am: c2615ed218 -s ours
am skip reason: change_id I3599377406b88751ee11139e9a1aa5afab734f7c with SHA1 5f78486ac1 is in history

Change-Id: Ib1f2ed83860c90bac56fed91f1277556f3146678
2019-04-09 21:18:09 -07:00
Chiachang Wang
3b4698c39c Merge "Move data stall definitions out from Setting"
am: e9a39ceb6b

Change-Id: Iff3db380ed6210811965ec8919acb6c06fbbf1da
2019-04-09 21:14:56 -07:00
Shuo Qian
c7d4788c63 [automerger skipped] Use Received Uri as Gateway Uri
am: 2a5098f888 -s ours
am skip reason: change_id I3599377406b88751ee11139e9a1aa5afab734f7c with SHA1 5f78486ac1 is in history

Change-Id: Ie2b30f7677476eb5b03d065b5535044da2157288
2019-04-09 20:52:59 -07:00
Andy Hung
2085a49260 Merge "AudioTrack: getLatency continues UnsupportedAppUsage" into qt-dev
am: d5701f0ecb

Change-Id: Ibac530c65c81948b4088b8fdb71d12b4251a91d7
2019-04-09 20:46:18 -07:00