Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
688,933 Commits 3 Branches 0 Tags
79fa2ad4eaefc37bbc93d07d7eaad66ef9e49db8
Commit Graph

11000 Commits

Author SHA1 Message Date
Jon Eckenrode
2348bd2d17 Merge "Added return value to overloaded bindService method." am: 59d082af63 am: 7756ed8db8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995510

Change-Id: I2ce6164ecb95dc3ea49cc0e9c04edc4782659e81
 2022-02-25 00:52:40 +00:00
Jon Eckenrode
7756ed8db8 Merge "Added return value to overloaded bindService method." am: 59d082af63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995510

Change-Id: I5868cc709613ee77b9cd40866582b58614dcc249
 2022-02-25 00:30:46 +00:00
joneckenrode
ecbb809686 Added return value to overloaded bindService method. 
Staged: https://android.devsite.corp.google.com/reference/android/content/Context#bindService(android.content.Intent,%20int,%20java.util.concurrent.Executor,%20android.content.ServiceConnection)

Test: Built API documentation
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: I9b5466441b7b5cb4deb5a8cc25cfd01a83be80ca
 2022-02-24 16:21:58 +00:00
Jon Eckenrode
5577fb24aa Merge "Revised API documentation of Context and ServiceConnection. See b/213625234." am: 08bb407612 am: e5a25d1d7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1975966

Change-Id: I3725bf4a04aaa5eb00cae32a2effd654893dc8bd
 2022-02-15 22:18:57 +00:00
Jon Eckenrode
e5a25d1d7c Merge "Revised API documentation of Context and ServiceConnection. See b/213625234." am: 08bb407612 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1975966

Change-Id: I608e10bbd7208ed90f23ab25ac28c5512a3ea4ca
 2022-02-15 22:02:50 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891 
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
 2022-02-11 07:25:43 +00:00
Jon Eckenrode
8f3f42fba0 Revised API documentation of Context and ServiceConnection. 
See b/213625234.

Test: Built API documentation
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: Icb2eb3eb13c291dca9fc6857db3a8657a23856f7
 2022-02-09 22:11:28 +00:00
TreeHugger Robot
a903f53919 Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev am: 459761c7a3 am: e83f686acc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Change-Id: I4785ca39baefb31700c721f75195feb58c3987e2
 2022-02-09 18:16:08 +00:00
TreeHugger Robot
e83f686acc Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev am: 459761c7a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Change-Id: I22db74620ad1ba4baf8d4421e59f4b06230f1c8f
 2022-02-09 18:10:53 +00:00
Presubmit Automerger Backend
167749b462 [automerge] Security fixes for PendingIntent related apis in LauncherApps 2p: e41e04bb8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744

Bug: 209607104
Change-Id: Ie671aa785fd13e9389b2fec0a02318e7b5e05861
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
 2022-02-09 03:12:23 +00:00
Pinyao Ting
e41e04bb8c Security fixes for PendingIntent related apis in LauncherApps 
Allowing arbitrary activityOptions during the creation of PendingIntent
is a source of security vulnerability. This CL removes activityOptions
from the call-site.

Bug: 209607104
Test: manual
Change-Id: Id262b9a0de58d8834c85d925cf84bb44b8b99742
Merged-In: Id262b9a0de58d8834c85d925cf84bb44b8b99742
 2022-02-09 03:12:10 +00:00
Ganesh Olekar
be486f55bb Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 am: b14e524ffd am: 4ff5bad43e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I1439303fe9858209c4e1c53e4a5a3220ee0ac569
 2022-02-05 04:45:46 +00:00
Ganesh Olekar
4ff5bad43e Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 am: b14e524ffd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I3844f812cfdbdf51da4f2f849d16794bb9679b90
 2022-02-05 04:31:21 +00:00
Ganesh Olekar
b14e524ffd Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I47da71211e30902d5f489f0dec109056b9503707
 2022-02-05 04:14:22 +00:00
Ganesh Olekar
45312b8382 Merge "Validate pid can be trusted" into sc-dev 2022-02-05 03:56:26 +00:00
Remi NGUYEN VAN
932b4b9135 Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68 am: 4973cc90d9 am: 57ce3e2203 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966441

Change-Id: I0d5479c8b6e7f20dbd430d119c0a33b121222e1a
 2022-01-31 14:37:01 +00:00
Xinyi Zhou
b56bb8fa98 Add NearbyService am: 17c5caf93e am: 56f293dba5 am: 54018f78e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966440

Change-Id: Ie8744fb79530aec185d7446afe3760ea9e631e29
 2022-01-31 14:36:58 +00:00
Remi NGUYEN VAN
57ce3e2203 Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68 am: 4973cc90d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966441

Change-Id: I209f5a3899e50a4bf69a1eebe1ac62e00ccb9f02
 2022-01-31 14:21:33 +00:00
Xinyi Zhou
54018f78e6 Add NearbyService am: 17c5caf93e am: 56f293dba5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966440

Change-Id: I4c0cf2ee03d702af1274cb13b4c79b1c20406e39
 2022-01-31 14:21:31 +00:00
Xinyi Zhou
48f1bb60fb Expose Conext.NEARBY_SERVICE as SystemApi 
(cherry-pick from downstream branch)

Merged-In: Ie9fb547e166e6c881dfd04383050375a11f84a9b
Test: Built successfully
Bug: 189954300
Change-Id: I5ee56ddd84d38ee24b559fea278c263d424508ed
 2022-01-31 17:40:36 +09:00
Xinyi Zhou
17c5caf93e Add NearbyService 
(cherry-pick from downstream branch)

Test: loaded on device.
Bug: 189954300
Merged-In: I399cdba08846a3eca1d7cd9378607b30fa8fd72d
Change-Id: Ib9ef2a7b34abe18b1a7a4b48f9a09bc2d5856ac6
 2022-01-31 17:39:19 +09:00
TreeHugger Robot
bb93951990 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6 am: 5150b2b56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I7f5b843e8a7c1c944ffc088556c64889e781e84f
 2022-01-27 19:05:33 +00:00
TreeHugger Robot
a325e1bd17 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: Ibb755f0f754c230678d3bfecc41b6aa36f834c6b
 2022-01-27 18:47:46 +00:00
TreeHugger Robot
5150b2b56c Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 am: dd9121aaf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I24513de281029178f2cdd9360ce87ed4d8eb210c
 2022-01-27 18:47:46 +00:00
TreeHugger Robot
dd9121aaf6 Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a177e057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16709491

Change-Id: I23f8aac37dde7a9390d8ff478122b13eb99275a2
 2022-01-27 18:29:12 +00:00
Hans Boehm
db7bb39fb9 Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9f am: a2e1dc8b9a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I449eec7c2bc21bfa5c7909a4508fbf899a59040d
 2022-01-27 01:01:31 +00:00
Hans Boehm
a2e1dc8b9a Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I626a291208a3063b93cdd0ef1de131162cc916cb
 2022-01-27 00:50:30 +00:00
Jackal Guo
7172238add Move CtsContentTestCases to group presubmit-large 
The test config takes longer than 900 seconds to run. Move it to a
dedicated group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Fix: 215431363
Fix: 215549069
Test: treehugger
Change-Id: Id9769bbc625b42257af603d69098ae69c0fabb80
Merged-In: Id9769bbc625b42257af603d69098ae69c0fabb80
(cherry picked from commit ccc91c4fa9)
 2022-01-24 23:45:31 +08:00
Hans Boehm
3492061b6d Prefer WeakReference.refersTo() to get() 
This is an initial pass over frameworks/core to avoid WeakReference
get(), since that can cause the referent to be unnecessarily retained.
Most of these were found by searching for "get() == null".

Bug: 215259836
Test: Treehugger
Change-Id: I5227b05ca22e83b886ccf6713989961076df3f8c
 2022-01-20 17:57:02 -08:00
David Zeuthen
2bf36b756d Merge "identity: Add multi-document presentation support." am: 91b96e3454 am: ae0d53c78d am: 62c776a7c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824674

Change-Id: Idb4d1ddd89a5ca58ccc852c67f098dad04cb1c5c
 2022-01-14 21:56:18 +00:00
David Zeuthen
62c776a7c2 Merge "identity: Add multi-document presentation support." am: 91b96e3454 am: ae0d53c78d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824674

Change-Id: I8b5ade103c4275871e990369c36480013f47f129
 2022-01-14 21:39:07 +00:00
David Zeuthen
91b96e3454 Merge "identity: Add multi-document presentation support." 2022-01-14 21:07:03 +00:00
Treehugger Robot
082f6e9f08 Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c04b am: d8ef70a405 am: 2f68d6bc5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945287

Change-Id: I447d2f861e1c05f9483fe60e48e45918c448adfd
 2022-01-13 02:24:11 +00:00
Treehugger Robot
2f68d6bc5c Merge "Make ACTION_SETTING_RESTORED SystemApi" am: 2e2a97c04b am: d8ef70a405 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945287

Change-Id: Ia012adfcf1febe63dc5dc8a89d5b2133fe909590
 2022-01-13 02:09:42 +00:00
Ganesh Olekar
f29223746d Validate pid can be trusted 
Bug: 200288596
Test: Manual
Test: atest android.security.cts.AttributionSourceTest#testPidCheck
Change-Id: I07f86ba220bedb1393f4d7ed23175e92d4576601
 2022-01-13 00:30:12 +00:00
William Escande
543d84f6b2 Make ACTION_SETTING_RESTORED SystemApi 
Because Bluetooth is going mainline, we need to remove call to hidden
API.
Intent.ACTION_SETTING_RESTORED and extra are currently hidden.
There is no known alternative, so this CL make them SystemApi.

Bug: 211851706
Test: Build + start bt
Tag: #refactor
Change-Id: I7a105946f075819f21b91a39bc37c6e167439bf4
 2022-01-12 19:33:02 +00:00
David Zeuthen
6fc37331a6 identity: Add multi-document presentation support. 
This new PresentationSession interface enables an application to do a
multi-document presentation, something which isn't possible with the
existing API. As a practical example of this consider presenting both
your Mobile Driving License and your Vaccination Certificate in a single
transaction.

Also update the documentation for IdentityCredential to clarify that
the same AuthKey is used for multiple getEntries() calls on the same
credential.

Also deprecate existing IdentityCredential.getEntries() method and
related methods and classes.

Bug: 197965513
Test: New CTS tests and new screen in CtsVerifier
Change-Id: I74534969143882552407917a82f44d43da12711c
 2022-01-11 10:40:51 -05:00
Amy Gu
9001310c40 Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df am: b5f0629d41 am: 379347b29a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I9d0089997234826e6310d4fcda14cdf869ec5fdb
 2021-12-21 19:06:21 +00:00
Amy Gu
379347b29a Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df am: b5f0629d41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I7e00c46550eba9eb810d5b5112d6a4dd30d157cf
 2021-12-21 18:53:01 +00:00
Amy Gu
d5451fb370 Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS 
Change-Id: If3fdaabf8456cc99f4cf7819ec89b3901a7c74c6
 2021-12-21 01:21:52 +00:00
Etienne Ruffieux
52dfe57f07 Merge "Moved AttributionSource related APIs in AttributionSource" am: 70d456d06c am: 52ddc063b0 am: e5d5eefb16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817

Change-Id: Id6bcfb0cca120540dd251dda22c713539c5c2b8c
 2021-12-16 22:08:37 +00:00
Etienne Ruffieux
e5d5eefb16 Merge "Moved AttributionSource related APIs in AttributionSource" am: 70d456d06c am: 52ddc063b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817

Change-Id: Id597191e675eca32c4d965fd4dc0e62dc2653283
 2021-12-16 21:42:01 +00:00
Etienne Ruffieux
70d456d06c Merge "Moved AttributionSource related APIs in AttributionSource" 2021-12-16 21:16:58 +00:00
Etienne Ruffieux
770d50ed43 Moved AttributionSource related APIs in AttributionSource 
Modified myAttributionSource() to check for global AS for
process in ActivityThread and fallback to building new AS
with PackageManager#getPackageForUid(myUid()) if null.

Tag: #feature
Bug: 210467846
Bug: 210468546
Test: build
Change-Id: I7aa75395469bf0bb806100420faaf98c52057355
CTS-Coverage-Bug: 210906055
 2021-12-15 22:03:50 +00:00
Naomi Musgrave
f6340cbbf3 Merge "Introduce WindowManagerState field for sandboxing" into sc-v2-dev am: f5284f89be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16340536

Change-Id: I4b2fd3e47e9cbb2e873fa0db37eed74f6badb734
 2021-12-08 23:00:26 +00:00
Naomi Musgrave
f5284f89be Merge "Introduce WindowManagerState field for sandboxing" into sc-v2-dev 2021-12-08 21:52:51 +00:00
Naomi Musgrave
5acb031f31 Introduce WindowManagerState field for sandboxing 
New field indicates if ActivityRecord#providesMaxBounds has
calculated that sandboxing of max bounds to match app bounds
should be applied.

Test: manual
Bug: 193514437
Change-Id: I91587ce1e1ded7435038e2d1a7d038be57ff0f2f
 2021-12-08 17:36:03 +00:00
Tom Natan
1cb7dbffd1 Merge "Remove EnabledSince from OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY" into sc-v2-dev am: 56b6a1936d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16405083

Change-Id: I9672c89a744537b07ffe1d28b92bbd1d73fef6d5
 2021-12-08 10:39:47 +00:00
Thiébaud Weksteen
6e8a545bff Merge "Add @JavaOnlyStableParcelable to AttributionSource" am: 5f5ff75870 am: 7228115341 am: e371f9ace3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908651

Change-Id: I70718406dd94c13d39e27984c5967e1f2647bc55
 2021-12-08 04:55:07 +00:00
Thiébaud Weksteen
e371f9ace3 Merge "Add @JavaOnlyStableParcelable to AttributionSource" am: 5f5ff75870 am: 7228115341 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908651

Change-Id: I24b6e309f896dfd9937f87739605c33d92c27cc6
 2021-12-08 04:32:27 +00:00