Commit Graph

16314 Commits

Author SHA1 Message Date
Rubin Xu
ac51bf8a40 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain
This change includes the following commits that are related to
CertInstaller and KeyChain:

7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
2020-07-15 15:50:14 +01:00
Treehugger Robot
2f3b72b8ef Merge "Clean up old references to android.support in Activity and Fragment" 2020-07-01 19:57:53 +00:00
Victor Chang
2ea241f6ee Use new package name for ZoneInfo and libcore.timezone
Bug: 141747409
Test: None
Merged-In: Id99a345ec024179295063c3644f72c062cb50554
Change-Id: Id99a345ec024179295063c3644f72c062cb50554
2020-06-30 13:53:47 +01:00
Aurimas Liutikas
1c7cc22adf Clean up old references to android.support in Activity and Fragment
Bug: 158760874
Change-Id: Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa
Merged-In: Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa
2020-06-29 23:27:48 +00:00
Neil Fuller
96c57398b4 Merge "Be more defensive around invalid tzids" am: f60c302dad
Change-Id: I08e1daaf9dd0a26017b18c984eb6d4093c46ed46
2020-05-26 10:36:28 +00:00
Neil Fuller
f60c302dad Merge "Be more defensive around invalid tzids" 2020-05-26 10:20:09 +00:00
Neil Fuller
26fe60a188 Be more defensive around invalid tzids
Add checks during boot in case the persist.sys.timezone property is set
to a bad ID.

This can happen in the rare case of a mainline rollback: i.e. if a device has
been set to a new ID and then the update is rolled back. Using GMT as a
fallback probably works without this change (it does in java.util.TimeZone),
but relies on all code, including native code that uses
persist.sys.timezone directly, knowing to interpret a bad ID as "GMT".
This commit makes that choice more explicit and defensive.

This change also removes the possibility of IOException, which is never
thrown, from some ZoneInfoDb methods.

Bug: 155738410
Test: boot with a valid id, verify persist.sys.timezone is unchanged
Test: boot with an invalid id set,  verify persist.sys.timezone is "GMT"
Merged-In: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Change-Id: I6dc0f4f81848efbbaec6a11a62014471a0ef01fd
Exempt-From-Owner-Approval: Approved / landed internally
2020-05-26 10:19:53 +00:00
Christopher Tate
72dbe56d76 DO NOT MERGE - Kill apps outright for API contract violations
...rather than relying on in-app code to perform the shutdown.

Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
Merged-In: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
(cherry picked from commit 45a53e6cb8)
(cherry picked from commit e737c1bc6295286a1a44979d2281c3eb637fe8b1)
2020-05-06 19:59:20 +00:00
Bill Yi
4806cccece Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" 2020-05-06 15:59:08 +00:00
Andrew Sapperstein
df8396f2c3 Fix last broken @see links in aosp.
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-05 22:16:10 -07:00
Andrew Sapperstein
50dd1eaaeb Fix last broken @see links in aosp.
Seems that the doc-comment-check-docs wasn't in presubmit.

Bug: 6963924
Bug: 155825675
Test: make doc-comment-check-docs
Change-Id: I018a50cd76b0fd5f8c3642efa1374e53f1b746a6
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-06 01:55:04 +00:00
Treehugger Robot
d14004d53b Merge changes from topic "ctor-refs" am: 1ac3746aa8
Change-Id: I974af9e767cb3683a4b5afedf4e30d2f33c88477
2020-05-05 21:12:08 +00:00
Andrew Sapperstein
23d5746e06 Fix broken @see tags in public documentation. am: 1f6e22cbd8
Change-Id: I04a78c9ba3770a4d651177aae697890094a52add
2020-05-05 21:12:04 +00:00
Bill Yi
b61408add5 Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
Change-Id: I7ce0992bd12158655c0f4833fd924c8012386996
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
Merged-In: Icd731877c220b0e3b39258812030313cbaba90c0
2020-05-05 20:34:22 +00:00
Andrew Sapperstein
2e5f38e0bf Update inner class constructor refs to use proper syntax.
Previously, we generally required fully qualified names for referring
to inner class constructors (like #Notification.Builder()) despite that
not being valid javadoc. Now, we properly support #Builder() syntax and
the old syntax will error.

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-01 00:43:54 +00:00
Andrew Sapperstein
1f6e22cbd8 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
2020-05-01 00:42:22 +00:00
Xiangyu/Malcolm Chen
d27d90453d Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." am: beccb937dd
Change-Id: I0a7420ff72fc27d14ac8ba88f5839a7a28e092b2
2020-04-08 00:05:14 +00:00
Linus Tufvesson
61f4581858 RESTRICT AUTOMERGE
Revert submission 10383599-type-presentation-q

Reason for revert: Breaks apps using Presentation in combination with private virtual displays
Reverted Changes:
I2aaab1903:RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...
Ib5a24f8be:RESTRICT AUTOMERGE Add test for Presentation

Bug: 141745510
Bug: 152342138

Merged-In: I0b3a332c286900952b65ece12435f981e324cb5b
Change-Id: I0b3a332c286900952b65ece12435f981e324cb5b
(cherry picked from commit a9211d687d)
2020-04-02 14:32:31 +00:00
Malcolm Chen
1cae35384b Hide APIs exposed for Telephony mainline which is no longer needed in R.
The APIs were added in b/144351078, b/148097978 and b/148116922.
b/151665796 is used to revert them.

Bug: 151665796
Bug: 144351078
Bug: 148097978
Bug: 148116922
Test: build
Change-Id: I08db8c5c0161747a7e775a8de0daa7077b513f10
Merged-In: I08db8c5c0161747a7e775a8de0daa7077b513f10
2020-04-01 12:46:51 -07:00
Linus Tufvesson
3228152d10 RESTRICT AUTOMERGE
Revert submission 10383599-type-presentation-q

Reason for revert: Breaks apps using Presentation in combination with private virtual displays
Reverted Changes:
I2aaab1903:RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...
Ib5a24f8be:RESTRICT AUTOMERGE Add test for Presentation

Bug: 141745510

Change-Id: I0b3a332c286900952b65ece12435f981e324cb5b
(cherry picked from commit a9211d687d)
2020-04-01 00:04:13 +00:00
Tyler Gunn
ab38a06f33 Merge "Update car mode API docs." am: f02ac9e439
Change-Id: I6d69324587f58fd0b52dea36b8a00625642dafb5
2020-03-30 18:57:25 +00:00
Tyler Gunn
f02ac9e439 Merge "Update car mode API docs." 2020-03-30 18:22:32 +00:00
Tyler Gunn
d5ee1a6325 Update car mode API docs.
1. Clarify the distinction between the prioritized and non-prioritized
intents.
2. Make the priority ordering and choice of them more clear.

Test: make -j offline; preview updated docs for formatting.
Fixes: 150685399
Change-Id: I493bca75db44f25eedb07964e3dc8c8ab38827c2
2020-03-30 09:34:11 -07:00
Treehugger Robot
f7f22f2539 Merge "Don't include the data dir in zygote library paths." am: 13033a2612
Change-Id: If910e9efbb5cb4cfbee80ed6b86358a549d21975
2020-03-26 15:29:12 +00:00
Treehugger Robot
13033a2612 Merge "Don't include the data dir in zygote library paths." 2020-03-26 15:03:26 +00:00
Shuo Qian
5fb0be0ac3 Merge "Hide several System APIs" am: 0d8a3bb0f6
Change-Id: Ibcae02d3d37832fb204aa5a4c372c89cf50c1409
2020-03-25 23:16:38 +00:00
Torne (Richard Coles)
89dea60b17 Don't include the data dir in zygote library paths.
When creating a LoadedApk in a zygote context (app zygote or WebView
zygote), don't add the app's data dir to the list of paths the dynamic
linker is allowed to load libraries from, because the linker's attempt
to canonicalize the path causes SELinux access denials. The process
can't access the data directory at all, so cannot load libraries from
there in any case.

Fixes: 149481620
Test: check for avc denials from webview_zygote
Change-Id: I9aceecaf6067e748cc2251782b0f41661cbb35d8
Merged-In: I9aceecaf6067e748cc2251782b0f41661cbb35d8
2020-03-25 12:39:59 -04:00
sqian
bc1f641138 Hide several System APIs
Test: Treehugger
Bug: 151241308
Change-Id: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1
Merged-In: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1
(cherry picked from commit 1e154a345c)
2020-03-24 18:40:23 -07:00
Remi NGUYEN VAN
6fc7f6e394 Remove NETWORK_STACK_SERVICE constant am: 4fb0137726
Change-Id: I5bf4b96601324620bd4db2ae8f04a877627568be
2020-03-23 03:48:01 +00:00
Remi NGUYEN VAN
341fa568b9 Merge changes from topic "netstack_constant_cherrypick"
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-23 03:33:58 +00:00
Remi NGUYEN VAN
4fb0137726 Remove NETWORK_STACK_SERVICE constant
Instead, have a dedicated method in android.net.NetworkStack allowing to
fetch the stable AIDL token for the service.

This avoids returning IBinder from getSystemService, as getSystemService
should generally return manager classes.

Test: atest FrameworksNetTests NetworkStackTests
Fixes: 151243982
Merged-In: I58a6e1f27aff052050197d1901f43a98d7aa1167
(clean cherry-pick from internal branch)

Change-Id: I75aba269595f3e315dd5e0693c878b2026e8e299
2020-03-23 11:28:56 +09:00
TreeHugger Robot
4c1f620af6 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:02 +00:00
Neil Fuller
f211324bfc Merge "Misc tidy up before adding geolocation classes" 2020-03-20 09:47:19 +00:00
Linus Tufvesson
af3eb61fed RESTRICT AUTOMERGE
Block TYPE_PRESENTATION windows on default display

... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()

Bug: 141745510
Test: cts-tradefed run cts -m CtsWindowManagerDeviceTestCases -t android.server.wm.PresentationTest
Change-Id: I2aaab1903dee54190338f7b6e49888aa51437108
(cherry picked from commit 60a6583adf)
2020-03-19 04:52:13 +00:00
Christopher Tate
e5a2051d2b DO NOT MERGE - Kill apps outright for API contract violations
...rather than relying on in-app code to perform the shutdown.

Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
Merged-In: I94d9de50bb03c33666471e3dbd9c721e9278f7cb
(cherry picked from commit 45a53e6cb8)
2020-03-19 04:52:07 +00:00
Automerger Merge Worker
99a5a61c51 Merge "Add OWNERS file for role." am: 5f00139706 am: 0958898aaf
Change-Id: If14c81641f0233835bb36c5f5f71de94881b64b9
2020-03-16 23:25:50 +00:00
Hai Zhang
5f00139706 Merge "Add OWNERS file for role." 2020-03-16 22:55:07 +00:00
Hai Zhang
9173da8f8a Add OWNERS file for role.
Test: build
Change-Id: Ib22925c0bdb97ea97964ad9fb08222ca27facbab
2020-03-16 11:03:12 -07:00
Automerger Merge Worker
c822c1d807 Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am: 4db4933c81 am: 288837ff3d
Change-Id: I0a4f3553330651ab274ff3521e404d3408450678
2020-03-16 10:36:19 +00:00
Lucas Lin
4db4933c81 Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" 2020-03-16 10:08:51 +00:00
Automerger Merge Worker
34e03cc8ad [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd am: c13c880914
Change-Id: Ia5e64eb524a852539850f46df87a6b28d4910cbc
2020-03-16 03:13:45 +00:00
Automerger Merge Worker
c13c880914 [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Junyu Lai
240f5bb4e9 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
lucaslin
86e560c749 Add some comments in isAlwaysOnVpnLockdownEnabled
Bug: 141621373
Test: Build pass.
Change-Id: Ib9df71192937164ff95ce564195d5d68508ec69d
2020-03-16 09:40:01 +08:00
Automerger Merge Worker
54c7cff5b5 Merge "Add @RequiresPemission compat framework APIs." am: 9a3446e067 am: e58704e2be
Change-Id: Ia935f69038e648bbc7b92b3e5c25ba16d9855a31
2020-03-13 19:50:59 +00:00
Treehugger Robot
9a3446e067 Merge "Add @RequiresPemission compat framework APIs." 2020-03-13 19:10:21 +00:00
junyulai
393e10d4cd [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
Automerger Merge Worker
913397e796 Merge changes from topic "sp20-stats-provider-permission" am: 0fa3b9e2e4 am: 344ecb4200
Change-Id: I765831bcb6059fa95cf59967becde4b9340cde39
2020-03-12 09:00:20 +00:00
Junyu Lai
0fa3b9e2e4 Merge changes from topic "sp20-stats-provider-permission"
* changes:
  [SP20] Check signature permission when accessing network stats provider
  Add permission check functions to NetworkStatsService
2020-03-12 08:19:24 +00:00
Automerger Merge Worker
2646c4a4ff RESTRICT AUTOMERGE am: 60a6583adf am: 20cd95a7f6
Change-Id: I7458a6f6a8178f31060e5a0150cddf5d20cc1fdb
2020-03-12 04:35:43 +00:00