Commit Graph

407742 Commits

Author SHA1 Message Date
Evan Laird
15b3599256 Touchup the dagger.md docs
I was going through the documentation saw that it could use some love

Test: visual
Change-Id: I837220364f63878fe5d751d000f414c01c9de419
2019-03-06 16:40:18 -05: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
Adrian Roos
4435924104 Merge "apilint: Lint unhidden @IntDef and @LongDef" 2019-03-06 12:43:55 +00:00
Adrian Roos
3478239c56 apilint: Lint unhidden @IntDef and @LongDef
@IntDefs and @LongDefs cannot be stored in a .class file, because the constant
names are lost. Instead, they are packaged out-of-band.

Therefore, they should never be in the API.

Test: python tools/apilint/apilint.py api/current.txt
Change-Id: If22e0cf7db0bb90dae6174bf546f2ec8be4e5458
2019-03-06 13:40:03 +01:00
Sundong Ahn
5eb6183d52 Merge "Add permission and permission.xsd" am: e5d100518d am: 27ea7c09d3
am: 872fe405e0

Change-Id: I699721fe8c1354d4a1f6adf70ccced59175aadd4
2019-03-06 04:20:11 -08:00
Sundong Ahn
872fe405e0 Merge "Add permission and permission.xsd" am: e5d100518d
am: 27ea7c09d3

Change-Id: I69ec0c2f8cfde85d3684f18558dfb5e4ca5b8137
2019-03-06 04:09:54 -08:00
TreeHugger Robot
7b7e39bd2a Merge "Add TEST_MAPPING for signed config." 2019-03-06 11:58:30 +00:00
Sundong Ahn
27ea7c09d3 Merge "Add permission and permission.xsd"
am: e5d100518d

Change-Id: I2bfa1ae166ac8cba7a2668f69a355203b41e2570
2019-03-06 03:57:49 -08:00
Treehugger Robot
e5d100518d Merge "Add permission and permission.xsd" 2019-03-06 11:49:03 +00:00
Issei Suzuki
d23038e5b9 Merge "Made inheritShowWhenLocked() API public." 2019-03-06 11:05:43 +00:00
Android Build Merger (Role)
46835775cf Merge "Merge "Add default-permissions" am: d05e13d0a4 am: da9ebd5a17 am: 0ed4f917ac" 2019-03-06 10:35:47 +00:00
Stanislav Zholnin
85d40b91cd Merge "Fix AssistantSettingsTest to properly write to DeviceConfig API, as it requires WRITE_DEVICE_CONFIG permission available through Shell." 2019-03-06 10:35:42 +00:00
Sundong Ahn
50c8a198f4 Merge "Add default-permissions" am: d05e13d0a4 am: da9ebd5a17
am: 0ed4f917ac

Change-Id: I146d7f5126f3420d958234f961d0b6580260d65c
2019-03-06 02:35:05 -08:00
Sundong Ahn
0ed4f917ac Merge "Add default-permissions" am: d05e13d0a4
am: da9ebd5a17

Change-Id: I06530ba7524549cf6e938231c2eca384e8a3f132
2019-03-06 02:25:58 -08:00
Zimuzo Ezeozue
101ac58981 Merge "Extend PackageWatchdog with explicit health checks" 2019-03-06 10:25:22 +00:00
Sundong Ahn
da9ebd5a17 Merge "Add default-permissions"
am: d05e13d0a4

Change-Id: If359ee759e26b7b065060768db9f591d856f213b
2019-03-06 02:16:36 -08:00
TreeHugger Robot
c2143015a2 Merge "Fix typo in RootOfTrust database creation." 2019-03-06 10:15:41 +00:00
TreeHugger Robot
04ae1ad9ab Merge "Update Nullability of Apis" 2019-03-06 10:05:30 +00:00
Sundong Ahn
d05e13d0a4 Merge "Add default-permissions" 2019-03-06 10:04:12 +00:00
Wei Sheng Shih
9ec61a3214 Merge "Revert "API tweaks"" am: c61bb461b6 am: 8230f428e4
am: fdc3dc5670

Change-Id: I53aba1bcac7bc5aabba152dcb9f6510befba4f69
2019-03-06 02:02:49 -08:00
Wei Sheng Shih
fdc3dc5670 Merge "Revert "API tweaks"" am: c61bb461b6
am: 8230f428e4

Change-Id: I74ed1783d59efa404e32a66ee764557a2400f8f2
2019-03-06 01:53:33 -08:00
Wei Sheng Shih
8230f428e4 Merge "Revert "API tweaks""
am: c61bb461b6

Change-Id: I8b9729b9afe1798b84193a4ce09777372585fc27
2019-03-06 01:44:14 -08:00
Wei Sheng Shih
c61bb461b6 Merge "Revert "API tweaks"" 2019-03-06 09:32:11 +00:00
Wei Sheng Shih
6042fca3f2 Revert "API tweaks"
This reverts commit f3e0eb8b0c.

Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered

Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
2019-03-06 09:15:17 +00:00
TreeHugger Robot
dd823c03d2 Merge "Add APIs to notify and restart activity in size compatibility mode" 2019-03-06 08:05:30 +00:00
Ivan Chiang
ffba15565f Update Nullability of Apis
Update Nullability of apis in DocumentsContract,
DocumentsProvider.

Test: make
Change-Id: Icc81333707bbeb9fe6d410ee35ade761e2d3b254
Fix: 126700626
Fix: 126702360
Fix: 126700352
2019-03-06 15:04:49 +08:00
TreeHugger Robot
6dcc8d303b Merge "WifiP2pManager: Add annotation Nullable for API: onDeviceInfoAvailable" 2019-03-06 06:11:12 +00:00
Zimuzo
9284e74585 Extend PackageWatchdog with explicit health checks
Allow PackageWatchdog to monitor packages with explicit health checks
enabled. In this case, at the end of a monitoring duration if a
passed-health-check callback is not triggered, the package would be
regarded as failed (in a later cl) and the observer is notified.
If monitoring without explicit health checks, the behavior is the same
as before, packages expire silently.

TODO: Implement the package failure trigger on expiry with failed
explict checks and enable added tests

Removed username from TODO comments

Bug: 120598832
Test: atest PackageWatchdogTest
Change-Id: Ib4322c327bcb00ca9a3fbdc83579e7b5f2fd633b
2019-03-06 05:41:42 +00:00
Sundong Ahn
e8f894d02e Add permission and permission.xsd
This module is for API check of java file generated from
permission.xsd

Bug: 80453829
Test: m -j
Change-Id: Ie70693400a6c9b261c8b1ca6197206ac3d17a271
2019-03-06 14:32:56 +09:00
Chen Xu
7f595dc7ff [automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 76b53f0948 am: e707f6217e
am: 52910403c5 -s ours
am skip reason: change_id Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1 with SHA1 4933ef2310 is in history

Change-Id: I322f64d408457ddc536eef9fc8519a902cf61de4
2019-03-05 21:29:35 -08:00
Chen Xu
52910403c5 Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 76b53f0948
am: e707f6217e

Change-Id: I4f6903635bf00b968dc61e76eec7f6db605b4d66
2019-03-05 21:16:14 -08:00
Sundong Ahn
8fbb952718 Add default-permissions
This module is for API check of java file generated from
default-permissions.xsd

Bug: 80453829
Test: m -j
Change-Id: Ic2d6b9a64ceb19711ce6f3fb2da0f1f01d17ebc5
2019-03-06 14:14:33 +09:00
Chen Xu
e707f6217e Merge "migrate cdma home eri from resource overlay to carrierconfig"
am: 76b53f0948

Change-Id: I6dce9a020c6131cbcc2a55af7e3c8be826a5b9c1
2019-03-05 21:07:04 -08:00
Chen Xu
76b53f0948 Merge "migrate cdma home eri from resource overlay to carrierconfig" 2019-03-06 04:58:36 +00:00
Chen Xu
62727a76d1 [automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: e5fd14aed5 am: 81e252c51d
am: f19990f19e -s ours
am skip reason: change_id I1ec160883282c8819727d3d56c909d9a1c7fd5d2 with SHA1 eb07e4ebff is in history

Change-Id: Ib097ce2a1b92f0e79515ff45b3ae625ee6dc242b
2019-03-05 20:18:47 -08:00
TreeHugger Robot
1b042a7c6e Merge "Pass ColorSpace to AnimatedImageDrawable" 2019-03-06 03:37:23 +00:00
TreeHugger Robot
e727454db8 Merge "Implement Dumpable on StatusBarStateController" 2019-03-06 03:35:39 +00:00
Chen Xu
f19990f19e Merge "migrate cdma home eri from resource overlay to carrierconfig" am: e5fd14aed5
am: 81e252c51d

Change-Id: Ic7b2f99dfc04dc0644233603ebd2a378c7904ab2
2019-03-05 19:34:39 -08:00
TreeHugger Robot
01a82fdd68 Merge "Update arguments for StartSubscriptionProvisioning API." 2019-03-06 03:31:50 +00:00
TreeHugger Robot
cf8333ea3d Merge "api-review: Add Executor and move callback to end of argument list" 2019-03-06 03:31:50 +00:00
Chiachang Wang
5df93de035 Merge "Update description based on API feedback" am: f397b39442 am: 784556da5b
am: d12b6c929e

Change-Id: Iae04c9f13a9bdd12b69e7780381f202a55bfc44f
2019-03-05 19:23:19 -08:00
Chen Xu
81e252c51d Merge "migrate cdma home eri from resource overlay to carrierconfig"
am: e5fd14aed5

Change-Id: Ic84ed20f676363b5c3cbfd82c25d18027f4b1267
2019-03-05 19:19:43 -08:00
Weien Wang
e3e3b3c030 Fix getSettingsSliceUri API review issues
1. Permissions for wallpaper settings Slice.
    2. Return value must be marked either @NonNull or @Nullable.

Solution:
    1. Add more explanation for settingsSliceUri API usage in javadoc.
    2. Follow the public API annotation rule.

Bug: 119118548
Bug: 126699851
Test: atest tests/Internal/src/android/app/WallpaperInfoTest.java

Change-Id: I5db88ce35ba11b018abe42f2192afed44a19fea5
2019-03-06 03:04:35 +00:00
Saurabh Kumar
81049a62be Merge "Read the activity uid from the assist data bundle." 2019-03-06 02:54:39 +00:00
Chen Xu
e5fd14aed5 Merge "migrate cdma home eri from resource overlay to carrierconfig" 2019-03-06 02:50:20 +00:00
Josh Tsuji
1dabb0c971 Merge "Use the new physics settings." 2019-03-06 02:49:06 +00:00
Josh Tsuji
51ae40ceec Merge "Always pass a legal position to expandFromStack so that we don't return to an illegal position." 2019-03-06 02:44:37 +00:00