Commit Graph

407806 Commits

Author SHA1 Message Date
Joshua Tsuji
ed386f2a10 Ignore onChildRemoved test due to random flakes.
Test: Just ignoring a test.
Change-Id: I4f902a8012e8bdafad1bc1abd34bc73b5f8145b1
2019-03-06 23:59:25 -05:00
Android Build Merger (Role)
4348a4d707 Merge "[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f304f4d2ea am: 734611e34e am: 0c09cf5011 -s ours am skip reason: change_id Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10 with SHA1 f4fb6fb754 is in history" 2019-03-06 19:17:47 +00:00
Andrei-Valentin Onea
fa1f4771f3 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f304f4d2ea am: 734611e34e
am: 0c09cf5011 -s ours
am skip reason: change_id Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10 with SHA1 f4fb6fb754 is in history

Change-Id: Icc50da0687097463a22dd7f982ca743372121185
2019-03-06 11:17:07 -08:00
TreeHugger Robot
5d9e667fdf Merge "Revert "Avoid LockSettingsService NPE during CTS due to races around user removal."" 2019-03-06 19:15:23 +00:00
Andrei-Valentin Onea
0c09cf5011 Merge "Add @UnsupportedAppUsage annotations" am: f304f4d2ea
am: 734611e34e

Change-Id: I14c15626440b2f1455110b6e504c4d18d2e5c5dc
2019-03-06 11:01:30 -08:00
Brad Ebinger
fe9b21d6ad Merge "Add Nullable/NonNull Annotations where appropriate." 2019-03-06 18:48:48 +00:00
Ashley Rose
0be2720c5b Merge "Add @InspectableProperty annotations to LayoutParams" 2019-03-06 18:38:18 +00:00
TreeHugger Robot
56ff8c44a5 Merge ""Global Actions Panel" plugin" 2019-03-06 18:34:35 +00:00
Android Build Merger (Role)
4d8cabe411 Merge "[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 842e3aa420 am: 20ebeb61a9 am: 438ec44268 -s ours am skip reason: change_id I6eba34467b2492047e5264684312adfa029eb317 with SHA1 fa152f9517 is in history" 2019-03-06 18:34:19 +00:00
Andrei-Valentin Onea
8d20baef91 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 842e3aa420 am: 20ebeb61a9
am: 438ec44268 -s ours
am skip reason: change_id I6eba34467b2492047e5264684312adfa029eb317 with SHA1 fa152f9517 is in history

Change-Id: Idd008d94089c218f008eb77bec3bae949fa62177
2019-03-06 10:33:43 -08:00
Adam He
682ea3ccfd Merge changes from topic "aa_whitelist"
* changes:
  Check for empty arguments in setWhitelist().
  Implemented a WhitelistHelper for whitelisting packages/activities for Augmented Autofill and Content Capture.
2019-03-06 18:31:59 +00:00
Andrei-Valentin Onea
734611e34e Merge "Add @UnsupportedAppUsage annotations"
am: f304f4d2ea

Change-Id: Ic5e5148c473e64bc5d8ff506e7f4ac78c409734c
2019-03-06 10:30:15 -08:00
Android Build Merger (Role)
ede37208f7 Merge "[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc am: a25b4e8c07 am: 03eb776b44 -s ours am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 9a8b6bf0f1 is in history" 2019-03-06 18:26:50 +00:00
TreeHugger Robot
2ccb9ca409 Merge "p2p: randomized MAC address feature config for OEM" 2019-03-06 18:26:31 +00:00
Andrei-Valentin Onea
9110dc8dc5 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc am: a25b4e8c07
am: 03eb776b44 -s ours
am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 9a8b6bf0f1 is in history

Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
2019-03-06 10:26:13 -08:00
Nazanin Bakhshi
b1c8eac075 Merge "make onActiveDataSubId in PhoneStateListener public API" 2019-03-06 18:22:48 +00:00
Soonil Nagarkar
8abfa8e822 Merge "Remove deprecated GNSS APIs + add nullability" 2019-03-06 18:21:39 +00:00
Andrei-Valentin Onea
bdcbe1c7d5 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 8cbc2e9ad1 am: 28eb381cae
am: 05e7acf737 -s ours
am skip reason: change_id I13583455e85c78cfca5f4d67e4b982b58178104e with SHA1 903da3725f is in history

Change-Id: I868f5591b7828da58a24a523af829bc645135cc4
2019-03-06 10:18:40 -08:00
Andrei-Valentin Onea
438ec44268 Merge "Add @UnsupportedAppUsage annotations" am: 842e3aa420
am: 20ebeb61a9

Change-Id: Ibcbbe37ffd476ea414a1041c015b8267a46a5402
2019-03-06 10:07:46 -08:00
Fan Zhang
516218f9b2 Merge "Revert "Set the "settings_network_and_internet_v2" flag to on by default"" 2019-03-06 18:03:59 +00:00
Antony Sargent
c9a5c72ab8 Revert "Set the "settings_network_and_internet_v2" flag to on by default"
This reverts commit 1b386491c5.

Reason for revert: Reverting temporarily because of a few bugs that were uncovered: b/127524919 and b/127394263

Change-Id: I47de22c89b680d08c62fb008f97953d0586ab0a3
2019-03-06 18:02:48 +00:00
Andrei-Valentin Onea
f304f4d2ea Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 18:01:47 +00:00
TreeHugger Robot
8e7a12edce Merge "Make ZenPolicy.Builder a final static inner class" 2019-03-06 17:59:50 +00:00
Andrei-Valentin Onea
03eb776b44 Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc
am: a25b4e8c07

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81
2019-03-06 09:57:27 -08:00
Andrei-Valentin Onea
05e7acf737 Merge "Add @UnsupportedAppUsage annotations" am: 8cbc2e9ad1
am: 28eb381cae

Change-Id: I87dcade4c34edea96a5add0d3b259e312625fc34
2019-03-06 09:51:46 -08:00
Andrei-Valentin Onea
20ebeb61a9 Merge "Add @UnsupportedAppUsage annotations"
am: 842e3aa420

Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
2019-03-06 09:46:00 -08:00
Andrei-Valentin Onea
a25b4e8c07 Merge "Add @UnsupportedAppUsage annotations"
am: cf03906edc

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
2019-03-06 09:41:34 -08:00
Andrei-Valentin Onea
28eb381cae Merge "Add @UnsupportedAppUsage annotations"
am: 8cbc2e9ad1

Change-Id: I83a19c3b85546749e360ef979e8e6eeac09e29ea
2019-03-06 09:37:26 -08:00
David Su
80421043ad Merge "Link Probing: Update comment to reflect that link probing is enabled by default" 2019-03-06 17:35:02 +00:00
Andrei-Valentin Onea
842e3aa420 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:19:05 +00:00
Andrei-Valentin Onea
cf03906edc Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Andrei-Valentin Onea
8cbc2e9ad1 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:17:27 +00:00
TreeHugger Robot
4a2d678eed Merge "Update UserManager APIs to follow API guidelines." 2019-03-06 17:17:23 +00:00
TreeHugger Robot
1a033dafa4 Merge "Add flag to indicate muting haptic channels." 2019-03-06 17:16:51 +00:00
Lucas Dupin
14696c131e Merge "Use test's TestableLooper" 2019-03-06 17:03:45 +00:00
Irina Dumitrescu
d74fb7c93c Revert "Avoid LockSettingsService NPE during CTS due to races around user removal."
This reverts commit e83f512553.

Reason for revert: http://b/125421639 was due to a bug in broadcasts which is now fixed.

Change-Id: I678d7721c948dadfbca8aca50183290438e7f451
2019-03-06 16:42:29 +00:00
Steve Elliott
9b87a44b79 "Global Actions Panel" plugin
This change adds a new plugin API surface inside of Global Actions,
where a plugin can provide a View to be rendered alongside the Global
Actions menu.

When the GlobalActionsDialog.ActionDialog is created, the plugin can
produce a GlobalActionsPanelPlugin.PanelViewController instance, which
is used to provide the View to be rendered, and respond to Global
Actions events (right now, only dismissal). At this time, the plugin
is given an instance of GlobalActionsPanelPlugin.Callbacks, allowing
the plugin to interact with the GlobalActionsDialog (right now, only
to request dismissal).

When there is a Panel present, a darker scrim is used that is *not*
based on the colors underneath.

In order to provide maximum flexibility, the View comprising the Panel
is rendered above (z-ordering) the existing Global Actions menu, and
can take up the entire screen if desired. In practice, plugins should
take care to not block access to the GlobalActions menu.

Change-Id: I9d6eea80f7eb49e9adbc1a634f7d9c1ab720cddb
Test: manual
2019-03-06 11:30:58 -05:00
Jeff Sharkey
715b34be65 Merge "Add trivial nullability annotations." 2019-03-06 16:17:56 +00:00
Andrei Onea
890db3d672 Add @UnsupportedAppUsage annotations
For packages:
  android.speech
  android.telephony.mbms.vendor
  android.view
  android.webkit

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10
Change-Id: I04104cf3852a0a7440676ccc55dd96c1eec730c4
2019-03-06 15:43:49 +00:00
TreeHugger Robot
095adc27dc Merge "Fail package if explicit health check does not pass" 2019-03-06 15:40:37 +00:00
Beverly
4c9a4cdc04 Make ZenPolicy.Builder a final static inner class
Fixes: 126698794
Test: atest ZenPolicyTest
Change-Id: I847831136fa017419eba3a00ce31091cfdb08d45
2019-03-06 10:37:19 -05:00
TreeHugger Robot
4e6d0182c7 Merge "Add @NonNull annotation to ZygotePreload API." 2019-03-06 15:21:34 +00:00
Fabian Kozynski
b4a3fae998 Merge "Fixes NPE in list from PrivacyItemController" 2019-03-06 15:20:04 +00:00
Andrei-Valentin Onea
94aeae08c0 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 15:06:05 +00:00
Eran Messeri
73b844d8fb Merge "Device ID Attestation: Fix API review" 2019-03-06 14:52:18 +00:00
Zimuzo
ef65fb8424 Fail package if explicit health check does not pass
As part of extending PackageWatchdog with explicit health check support
in Ib4322c327bcb00ca9a3fbdc83579e7b5f2fd633b. Trigger the observers #execute
method if a package never passed explicit health check on expiry.

Bug: 120598832
Test: atest PackageWatchdogTest
Change-Id: I8e916a6ca115d3883fe29f66456da36cd0ed09fb
2019-03-06 14:05:09 +00:00
Tony Mak
9a3c1f1dfe Configurable NAS by using DeviceConfig
The latest plan is only system apps with a certain privilege permission
could become NAS. And DeviceConfig could specify any of these valid
candidate to be the default NAS.

So the logic would be like this:
1. If user has set the NAS manually, NMS will persist the user_set bit
   and never mess with it.
2. If it is not the case, NMS will try the NAS defined in DeviceConfig,
   and then the one defined in config.xml

Also added some new shell commands for easy debugging.

Test: atest NotificationAssistantTest.java
Test: atest NotificationManagerServiceTest.java
Test: Use "device_config put" command to set a valid one. Observe that
      NAS is updated and persisted across reboot.
Test: Repeat the command with an invalid one, observe that NAS is not
      updated.
Test: Go to settings, set a NAS, and repeat the device_config command,
      observe that NAS is not changed.
Test: Go to settings, set NAS to be none. Reboot the device, and "none"
      is persisted.

FIXES: 123566150

Change-Id: Ibf8e498944afd5d1fa8659a856a8abdcce41f092
2019-03-06 13:27:53 +00:00
Adrian Roos
084e471703 Merge "apilint: Lint unhidden @IntDef and @LongDef" am: 4435924104 am: cec0f35fcc
am: 748ed1ad44

Change-Id: Iccbb4042411822a0c489a8f7622747a8dd23df4e
2019-03-06 05:16:17 -08:00
Adrian Roos
748ed1ad44 Merge "apilint: Lint unhidden @IntDef and @LongDef" am: 4435924104
am: cec0f35fcc

Change-Id: Ie5646faa1b8bf2665d70ed683dbd365e6c550c13
2019-03-06 05:06:41 -08:00
Adrian Roos
cec0f35fcc Merge "apilint: Lint unhidden @IntDef and @LongDef"
am: 4435924104

Change-Id: I7d12ed9f2ac7fcdc6490a7fcd2e5c99a21fe7110
2019-03-06 04:57:33 -08:00