Commit Graph

529465 Commits

Author SHA1 Message Date
Mathew Inwood
626e204e7e Merge "Derestrict PROP_NAME_MAX." am: caf6c158bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492817

Change-Id: Iec80d5a3b0c482d33c6551f06a4f5ddd6feb5474
2020-11-10 13:21:09 +00:00
Mathew Inwood
caf6c158bb Merge "Derestrict PROP_NAME_MAX." 2020-11-10 11:39:03 +00:00
Alan Stokes
57fef24446 Merge "Retry to get and mount CE data directory again" am: 5737120c84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479477

Change-Id: Id57e9a0ea559d12cbd7466c4d3d80555d77164a0
2020-11-10 11:00:43 +00:00
Alan Stokes
5737120c84 Merge "Retry to get and mount CE data directory again" 2020-11-10 10:11:41 +00:00
Lucas Lin
4dc9bb97c4 Merge changes I67e5fa23,I223b207c am: 32f5d14cef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I74209eccb2fd5473d65968f765f3eb54ee99954e
2020-11-10 05:47:18 +00:00
Trung Lam
26fcba8c97 Merge "Fix issue with saving protos to disk during shutdown." am: 68e0de029a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492076

Change-Id: Ic7b04f9f0be8c0552cefaf58d57c914e9386b57a
2020-11-10 05:41:51 +00:00
Lucas Lin
32f5d14cef Merge changes I67e5fa23,I223b207c
* changes:
  Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
  Use local defined constants for notification channels
2020-11-10 05:28:33 +00:00
Trung Lam
68e0de029a Merge "Fix issue with saving protos to disk during shutdown." 2020-11-10 05:20:22 +00:00
Shuo Qian
84838b0a56 Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e05985
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484359

Change-Id: I51f66b5bbe5c7af178541d6a86dfaec02a0c5973
2020-11-10 04:08:46 +00:00
Shuo Qian
9666e05985 Merge "Introduce new App Ops permission for 3rd-party InCallService" 2020-11-10 03:53:25 +00:00
Pin-Chuan Liu
1b936b73c3 Retry to get and mount CE data directory again
CE might unlocks and the name is decrypted,
gets the name and mounts it again.

Bug: 162298284
Change-Id: Ic5fec356bb55d54b7f8ad2933229511b50797a08
2020-11-10 10:12:29 +08:00
sqian
74207ec1fb Introduce new App Ops permission for 3rd-party InCallService
This permission is intended to be used internally as a system App Ops permission, and let CompanionDeviceManager or RoleManager to grant with
users. If it is granted by user, the corresponding companion app has the ability to query the details of the ongoing calls, and also manage its life cycle.

Bug: 169595473
Test: atest ThirdPartyInCallServiceAppOpsPermissionTest
Change-Id: Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49
Merged-In: Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49
(cherry picked from commit 334ab546e4)
2020-11-09 21:00:55 +00:00
Tyler Gunn
7e94f9e844 Merge "Remove redundant permission requirements docs." am: ef2c66e72f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490126

Change-Id: Iae73a3c94da94da0f811cb26f00a24db2a51c60b
2020-11-09 17:28:04 +00:00
Tyler Gunn
ef2c66e72f Merge "Remove redundant permission requirements docs." 2020-11-09 17:06:30 +00:00
Mathew Inwood
fcdba12869 Derestrict PROP_NAME_MAX.
Turns out it is used afterall.

Change-Id: I1ba83a151b0ca6ba708b03b46106dfb29d8b592f
Fixes: 172649311
2020-11-09 16:32:33 +00:00
Andrei-Valentin Onea
81eb255fa2 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: Ifb31bb97e89c434e7556826bc4c618e902c7932d
2020-11-09 15:12:35 +00:00
Mathew Inwood
eb80316624 Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I35f65987f7f9287cf03418e9feb27c81f4fd1878
2020-11-09 15:09:11 +00:00
Andrei-Valentin Onea
5bba56e147 Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" 2020-11-09 14:58:38 +00:00
Mathew Inwood
f8abe13db4 Merge "Add maxTargetSdk restriction to unused APIs." 2020-11-09 14:41:20 +00:00
Dario Freni
20d93a701c Merge "Add ability to stage multiple apexs." am: 7bd2a5e4fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490738

Change-Id: I2db219e6e6e9f2ba6c685cb2462da66bcbe5f91f
2020-11-09 11:32:45 +00:00
Dario Freni
7bd2a5e4fd Merge "Add ability to stage multiple apexs." 2020-11-09 11:00:02 +00:00
Dario Freni
5f541cbb88 Add ability to stage multiple apexs.
Test: atest sharedlibs_hosts_test
Change-Id: I9dfc6b783fd63c555622932d59712c0e0b9b073e
2020-11-09 10:27:04 +00:00
Trung Lam
f1ab984b11 Fix issue with saving protos to disk during shutdown.
Test: Built and tested on device.
Bug: 172789268
Change-Id: I9cb65e7560f92387e92234929a0b7881f84d7b8f
2020-11-09 08:27:39 +00:00
Treehugger Robot
2901676439 Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aae2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426850

Change-Id: I4984eeb50a8c35a89099e6d300d3f6b6a36e62e4
2020-11-06 22:04:38 +00:00
Tyler Gunn
1a4f04068a Remove redundant permission requirements docs.
Methods use @RequiresPermission annotation to declare permissions.
This CL removes redundant javadoc which also state the permission reqs;
the @RequiresPermission annotation results in autogenerated permission
docs.
Let some references in the javadoc in where a permission OR a role is a
requirement to use an API, or where permissions had specific API levels
noted in the javadoc.

Test: make docs
Fixes: 137633265
Change-Id: Id1ab7090def6b1d0dbdc8d2cc8586b5341e2eb7e
2020-11-06 13:19:27 -08:00
Treehugger Robot
26b017aae2 Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" 2020-11-06 20:27:15 +00:00
Colin Cross
ddf88a50cc Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: I61a70a6016a54fae273bc8689bd3fae5b1815dba
2020-11-06 19:40:35 +00:00
Colin Cross
4d506d7420 Merge "Revert "Add genrule for combined srcjar of modules"" 2020-11-06 19:28:34 +00:00
Colin Cross
9018bfbf0f Revert "Add genrule for combined srcjar of modules"
This reverts commit ddf171aaf8.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: Ibd1269d72f15b43817ffec50eb94f72671e7538b
Merged-In: Ifb5f56bf5468969ad026f10186763ef604113adc
2020-11-06 19:26:56 +00:00
vichang
5dbeacab6b Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736

Change-Id: I95f99bbb58d8b25f9ce24be92669ba2916f6d70c
2020-11-06 19:00:22 +00:00
vichang
65d1fda8f6 Merge "Move WallTime out of ZoneInfoData" 2020-11-06 18:01:08 +00:00
Michael Sun
b726bcfd65 Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480304

Change-Id: I5e4dda071a047dbd5d13f23898d7ea02e72ea5f1
2020-11-06 17:39:23 +00:00
Michael Sun
e40aa2d118 Merge "Update to use new android.system.suspend.control AIDL interface" 2020-11-06 17:35:58 +00:00
James Mattis
e92d8a7865 Merge "Adding API stubs for application network routing" am: 20a9e59e25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478963

Change-Id: I293192102c800a9dd8f09c32f890728e802cc965
2020-11-06 17:32:56 +00:00
James Mattis
20a9e59e25 Merge "Adding API stubs for application network routing" 2020-11-06 17:03:25 +00:00
Anton Hansson
730982b142 Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716

Change-Id: I32ff7332f8604278f07a832c52713ec727c2560f
2020-11-06 15:32:51 +00:00
Anton Hansson
1452dc60ca Merge "Add genrule for combined srcjar of modules" 2020-11-06 14:55:18 +00:00
Andrei Onea
4299e79da7 Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON
Use @EnabledSince instead of @EnabledAfter for DISALLOW_DUPLICATE_FIELD_IN_SKELETON

Test: m
Bug: 172238506
Change-Id: I041e1e2694f310d638e31b475f29d0d214711dd5
2020-11-06 14:55:06 +00:00
Victor Chang
1925c89f8f Move WallTime out of ZoneInfoData
Bug: 139480281
Test: m droid
Change-Id: I4a81bb45e874480c7d1dd5f7736b529344d8d9fa
2020-11-06 11:36:13 +00:00
Treehugger Robot
53a2ffe768 Merge "Remove useless code" am: 646cf23c3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490245

Change-Id: Id5c6ab919f223fd4da2838c477d7f5665066917c
2020-11-06 11:34:17 +00:00
vichang
6cb4bb76d6 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: I4e4b657a908907780c7530e30b05531e1ffe1017
2020-11-06 11:24:03 +00:00
Treehugger Robot
646cf23c3c Merge "Remove useless code" 2020-11-06 11:02:23 +00:00
vichang
ffcc7427a8 Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" 2020-11-06 10:51:53 +00:00
James Mattis
d38f48a83f Adding API stubs for application network routing
Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: Ib055aa37a7bf0c48c335307afc2258aa869c4267
2020-11-06 00:08:13 -08:00
Chalard Jean
c74389c5fc Remove useless code
The semantics of this block are such that restart will
only be false if all components of mArguments are null.
mArguments is a final array initialized in the
constructor of LegacyVpnRunner. The components of the
array are never overwritten (though the components of
those components are), and at least one of these
components will always be non-null (unless somebody
calls startLegacyVpnPrivileged with a non-existing
type, but that never happens).

For safety, this patch also adds a check so that
the code will crash early with a clear message if this
ever happens.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I1f13aa08c6f1870c9610185b603af76f97c22bab
2020-11-06 15:56:27 +09:00
Remi NGUYEN VAN
2442a58473 Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I8c03acd5af53d8dccd183d791a1acaf434d81169
2020-11-06 05:30:32 +00:00
Daniel Bright
98a2cb4729 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: Ica2a83344b5888ab9a423515005bd6c5ba7e5284
2020-11-06 05:24:04 +00:00
James Mattis
2feb4fb0a0 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
2020-11-06 05:19:47 +00:00
Remi NGUYEN VAN
64512597fd Merge "Move VPN JNI to the bottom of srcs" 2020-11-06 05:04:53 +00:00
Daniel Bright
bc99f76305 Merge "Allows APN to be unthrottled through an indication" 2020-11-06 05:04:14 +00:00