Commit Graph

10721 Commits

Author SHA1 Message Date
Matt Gilbride
2f3bc71868 Merge "Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks" am: a3862537ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2311186

Change-Id: I4ad458fee77e00dd491407a5122c3c1173cf4e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 11:40:26 +00:00
mattgilbride
d8323e8684 Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks
The new method hasExplicitIdentity will track whether the caller is
within a Binder.clearCallingIdentity/restoreCallingIdentity block based
on packing this state information into the token returned by clearCallingIdentity.

Bug: b/252975769
Test: android.os.cts.BinderTest
Change-Id: I162db933f9e52cd6f9f46796bda11ad6216d3d66
2022-11-21 20:24:28 +00:00
Nikita Ioffe
8a2d970870 Merge "Add Process.isIsolatedUid(int uid) API" am: 4fa14ea225
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231970

Change-Id: Id44255ed0e6e396367f67e82b8c9834d8f4d4ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 17:00:29 +00:00
Nikita Ioffe
4fa14ea225 Merge "Add Process.isIsolatedUid(int uid) API" 2022-11-16 16:58:19 +00:00
Parth Sane
2ca4a6f36a Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2297837

Change-Id: Ic57f33eaadd7a7a197cfabb44a7d362a77c71694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 13:27:51 +00:00
Parth Sane
60bcab9367 Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" 2022-11-15 13:03:21 +00:00
Vikram Gaur
0dda81576c Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820

Change-Id: Ifd1b61af5be088fcb6695110e73561f67a82052c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:09:08 +00:00
Vikram Gaur
81a458a73c ServiceManager APIs for Remote Key Provisioning mainline module.
ServiceManager.getDeclaredInstances is needed for Remote Key
Provisioning mainline module to get all the implementations for
IRemotelyProvisionedComponent.

Test: build + usage in Remote Key Provisioning mainline module.
Change-Id: I92545104fa9bc190fe7c2f84b33d5f8693fcc2a4
2022-11-11 22:46:33 +00:00
Peter Kalauskas
5f154f25fe Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778

Change-Id: Ieaca8f7cd9fbb7045ea1b099a7539bca3de8d4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 19:24:57 +00:00
Peter Kalauskas
66e5f1dac2 Merge "Log wtf for warn-on-blocking on eng builds" 2022-11-10 18:47:39 +00:00
Parth Sane
1eb9a2e634 Add TRACE_TAG_AIDL to SystemApi for mainline modules
Test: manual

Change-Id: I76de5146f49256884e2de88dcb42789365e5d081
Bug: 236441443
2022-11-10 15:37:52 +00:00
Bill Yi
0de01a9871 Merge TP1A.221105.002 to aosp-master - DO NOT MERGE
Merged-In: I7caa2e966bae2ec146ca77b36d2a467d746e2531
Merged-In: I361e8838571ab7b3f19778833b820f0b1b584d94
Merged-In: I361e8838571ab7b3f19778833b820f0b1b584d94

Change-Id: Ic9224a1948b26c8703a272aa3b26337e0586f3e3
2022-11-09 06:33:42 +00:00
Treehugger Robot
2f81ba23b1 Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: Ife5037af2f34045622b8fa5ad032ab49235f2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 15:51:52 +00:00
Treehugger Robot
1bd897f545 Merge "Remove permissions team from PermissionEnforcer OWNERS" 2022-11-07 15:14:46 +00:00
Treehugger Robot
ab6871e798 Merge "Unify binder txn trace name" am: 47050bb8b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660

Change-Id: Id1a923219c3f5b62ba27af8a4641a9857e6755ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 16:38:38 +00:00
Treehugger Robot
47050bb8b6 Merge "Unify binder txn trace name" 2022-11-04 15:31:23 +00:00
Peter Kalauskas
b3cedbba88 Log wtf for warn-on-blocking on eng builds
Log.wtf on eng builds when setWarnOnBlocking is enabled. Previously,
setWarnOnBlocking would only log a WTF on userdebug builds.

Bug: 32715088
Test: Manual
Change-Id: Iab416c58827db558d21e518c09af1dac1569ebe8
2022-11-03 14:00:25 -07:00
Hai Zhang
2ba6452ffc Remove permissions team from PermissionEnforcer OWNERS
Our team didn't implement and isn't intended to be the owner of this.

Change-Id: I7dd17d41c930fd3d1e5771e7779cb2e9927c9c43
Test: presubmit
2022-11-02 23:37:43 +00:00
Thiébaud Weksteen
1799c950be Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2271808

Change-Id: Id668deb3f8ec6b08f6e0bc9556e54cf317d41cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 23:37:19 +00:00
Thiébaud Weksteen
0c93fbab73 Add PermissionEnforcer class am: ec0d763059
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2272966

Change-Id: If59d54d09ee650643d28b26ef41c245acea74f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 23:36:55 +00:00
Thiébaud Weksteen
4f2bc9a73a Merge changes I72f810a7,I2bd23f62
* changes:
  Add OWNER entry for android.os.PermissionEnforcer
  Add PermissionEnforcer class
2022-11-02 23:03:07 +00:00
Zim
762a8b305a Unify binder txn trace name
To match cpp aidl trace name for easier perfetto parsing

Test: Manual
Bug: 161393989
Change-Id: I21d788c8de27327bd3f64da2e8cf14e6fcf9d073
2022-11-02 10:33:45 +00:00
Gil Cukierman
c8188d9619 Add DISALLOW_CELLULAR_2G As a New User Restriction am: a247dae4d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218172

Change-Id: I130b049513d0bbd099549ff38867fa85be6514f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 14:21:53 +00:00
Gil Cukierman
6c70a328e5 Merge changes from topic "cukie-2genterprise-user-restriction"
* changes:
  Add TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTION
  Add DISALLOW_CELLULAR_2G As a New User Restriction
2022-11-01 13:51:58 +00:00
Treehugger Robot
79ff332cac Merge "Parcel: noop upon double recycle" am: 0c35c51d71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989

Change-Id: I479c14ab1cd063a4c95623080dac1d81c4c28644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 11:04:46 +00:00
Treehugger Robot
0c35c51d71 Merge "Parcel: noop upon double recycle" 2022-11-01 10:15:54 +00:00
Steven Moreland
afc0bc4c56 Merge "Parcelable: getStability in system API" am: 2681cb2d92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276108

Change-Id: Id77b5c1ea943e713b552941304f4aed272227824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 18:39:46 +00:00
Steven Moreland
2681cb2d92 Merge "Parcelable: getStability in system API" 2022-10-31 17:39:56 +00:00
Gil Cukierman
a247dae4d4 Add DISALLOW_CELLULAR_2G As a New User Restriction
Bug: 247121216
Test: atest UserRestrictionsTest
Change-Id: I9be85ae7a9bfb3f287ea972bbaac35469e8d772b
2022-10-31 13:25:51 +00:00
Ian Elliott
104dbe4a0e Can switch to legacy GLES driver when ANGLE is system driver am: 1cf20cd849
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2269788

Change-Id: Ic2394b6626d7cc84cf38fab1008fb7c4c4bb3432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 04:07:50 +00:00
Ian Elliott
9e7649d5e7 Merge changes from topic "UpstreamAngleSwitch"
* changes:
  Add 2 ANGLE deferlist settings
  Can switch to legacy GLES driver when ANGLE is system driver
2022-10-28 03:55:27 +00:00
Steven Moreland
558ba131f9 Parcelable: getStability in system API
Requirement to use stable AIDL parcelables in priv-apps.

Bug: 254476191
Test: aidl_integration_test, build target added which uses this
Change-Id: Ib2434e5566bf8bd804f76cf1e63ec1df0e904d77
2022-10-28 00:32:53 +00:00
Steven Moreland
6f585129c4 Merge changes I7315059b,If2dd13d8 am: 08b17a98a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2270567

Change-Id: I3c2bb506bd680209a74c861d39443cbf97c5e634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 21:34:41 +00:00
Steven Moreland
08b17a98a8 Merge changes I7315059b,If2dd13d8
* changes:
  Binder: don't call getCallingUid for RPC calls
  Parcel: lift 'isForRpc' here from native
2022-10-27 20:56:19 +00:00
Jintao Zhu
64ff38669a Parcel: noop upon double recycle
Fix this scenario:

  Parcel p = Parcel.obtain();
  p.recycle();
  p.recycle(); // illegal but possible

  Parcel p1 = Parcel.obtain();
  Parcel p2 = Parcel.obtain();

  ASSERT_TRUE(p1 != p2); // fail!

Signed-off-by: Jintao Zhu <zhu.jintao@gm.com>

Change-Id: Ied25188549801122874a05c2e66969e1f281b346
2022-10-27 21:55:16 +08:00
Thiébaud Weksteen
0e318f1938 Add OWNER entry for android.os.PermissionEnforcer
Bug: 241171714
Bug: 243724362
Test: Gerrit OWNERS validation plugin
Change-Id: I72f810a75ebee3813fc7ad87f8187a0ebc135bc7
2022-10-27 13:21:37 +11:00
Thiébaud Weksteen
ec0d763059 Add PermissionEnforcer class
Defines a new PermissionEnforcer class used to check permission as part
of the @EnforcePermission AIDL annotation. It is registered as a system
service to avoid the cost of creating a new object for each new client.

Bug: 234083358
Test: TH
Change-Id: I2bd23f62a0d207ddac6bbe69666ced96e77ba16f
Merged-In: I2bd23f62a0d207ddac6bbe69666ced96e77ba16f
2022-10-27 12:12:11 +11:00
Ian Elliott
1cf20cd849 Can switch to legacy GLES driver when ANGLE is system driver
Change the sense of the run-time switches so that ANGLE can be an
optional GLES driver or the default system GLES driver.  When ANGLE is
the system GLES driver, also handle the case of there being no legacy
GLES driver.

Test: logcat
Test: atest CtsAngleIntegrationHostTestCases
Test: atest CtsEffectTestCases:android.effect.cts.EffectTest#test5_effectCreate
Bug: 224558229
Change-Id: Ie53f5221d51b62db226c0c634537959612a06655
Merged-In: Ie53f5221d51b62db226c0c634537959612a06655
2022-10-26 18:04:25 -06:00
Steven Moreland
617e30b8a4 Merge "markVintfStability for priv-apps" am: e72e27929f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268195

Change-Id: I27363039030cd4f9232d4c759db892b448f38e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 20:38:44 +00:00
Steven Moreland
e72e27929f Merge "markVintfStability for priv-apps" 2022-10-26 19:55:38 +00:00
Steven Moreland
04a6a74682 markVintfStability for priv-apps
Any AIDL interface that has @VintfStabilty should be
able to be used everywhere.

Bug: 254476191
Test: aidl_integration_test
Change-Id: I3138a6e4dbfdfb972d87e7c4eb9b591be40b6d39
2022-10-26 16:33:48 +00:00
Jooyung Han
370d00283f Merge "add ServiceManager.getUpdatableNames()" am: a031dd980a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2266809

Change-Id: Ic5940794efa51c9f25ac0f80151497185005f48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 04:40:28 +00:00
Steven Moreland
b95831cbd9 Binder: don't call getCallingUid for RPC calls
All the code using getCallingUid here should be
ripped out anyway because it's Java-centric. Here
are some of the issues with the current stuff around
here:
- it's broken because it won't handle things happening in
  native code
- it's slow (e.g. big transactions are already logged in
  native code anyway)

Bug: 254835230
Test: boots, atest MicrodroidTestApp (with new tests)
Change-Id: I7315059bff138966e9509f1d529a6417466d2b7f
2022-10-26 01:21:38 +00:00
Steven Moreland
b6663f9d82 Parcel: lift 'isForRpc' here from native
Platform API, in order to fix bugs like b/254835230 where
certain utilities call getCallingUid, which doesn't make
sense for RPC calls.

Bug: 254835230
Test: android.os.ParcelTest
Change-Id: If2dd13d8edd515c945ccde2a2554f6f2b7b87b26
2022-10-26 01:21:38 +00:00
Jooyung Han
2f0d179958 add ServiceManager.getUpdatableNames()
Bug: 254201177
Test: m
Change-Id: I6921263e1f99c735c322a030d54ccc09a995563e
2022-10-26 09:41:05 +09:00
Sergey Nikolaienkov
594024a57b Merge "Update core/java/android/os/storage/OWNERS" am: 17da6cad86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263103

Change-Id: I23db15ab5498759f3ad4cfd1ff2827709704d6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 21:07:36 +00:00
Sergey Nikolaienkov
b03d346354 Update core/java/android/os/storage/OWNERS
Bug: -
Test: not really...
Change-Id: I71ef824d0f1bbc80ece29fc1915ba327f2436752
2022-10-21 08:26:40 +02:00
Zimuzo Ezeozue
aab9d2dba5 Merge "Populate binder trace txn names lazily" am: f31dc9a61b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254277

Change-Id: Idd634734951de7a2aa16d1883568e5b9024f81a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 17:47:13 +00:00
Zimuzo Ezeozue
c3355df5da Merge "Skip tracing missing binder txn names" am: da1c78d158
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254719

Change-Id: I56ebf652bb9b73772df918aebb268caa7bf3f20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 17:45:34 +00:00
Zimuzo Ezeozue
7a54741e61 Merge changes from topic "aidl_trace" am: e75a6f8696
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254718

Change-Id: Iaa231773191a436e176730d0fb5ae1a9965d71ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 17:45:02 +00:00