Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,808 Commits 3 Branches 0 Tags
ff8212309d14441ecc48dd63be93b22269fe864b
Commit Graph

11035 Commits

Author SHA1 Message Date
Makoto Onuki
b5ca3914fe Merge "Update OWNERS for the content and sync subsystem" am: f3265025d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2051441

Change-Id: Iea0c1d40359565041c6ae4f54083ebda0ef6532e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-20 16:54:14 +00:00
Makoto Onuki
f3265025d8 Merge "Update OWNERS for the content and sync subsystem" 2022-04-20 16:27:47 +00:00
Sudheer Shanka
33c901faa0 Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." am: d8705358c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065471

Change-Id: I53cc5c9a7baec50eb58417fd1df5c8aa0c33a742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 19:48:41 +00:00
Sudheer Shanka
d8705358c6 Merge "Fix javadoc on Context#BIND_FOREGROUND_SERVICE." 2022-04-18 19:24:34 +00:00
Sudheer Shanka
54dd6faf2b Fix javadoc on Context#BIND_FOREGROUND_SERVICE. 
Test: n/a
Change-Id: I5c5853cfb88c69e5cf39456fbc163af522410331
 2022-04-17 23:48:47 +00:00
Bill Yi
95267eaf87 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE 
Merged-In: Iae1a66165221f45051be17c4d047b5bd5be3999b
Merged-In: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Change-Id: I2c75988c023cec548e3a576cb0c3a1a13bb0016f
 2022-04-07 18:40:59 -07:00
Jon Eckenrode
d697c8b46d Merge "Updated API documentation of screenWidthDp and screenHeightDp." am: ec2121901c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030783

Change-Id: I607d3723b0d2855f9b53f30cd4dda058ff3b4d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 18:00:57 +00:00
Jon Eckenrode
ec2121901c Merge "Updated API documentation of screenWidthDp and screenHeightDp." 2022-04-04 17:36:37 +00:00
Makoto Onuki
84b3442e28 Update OWNERS for the content and sync subsystem 
Bug: N/A
Test: treehugger
Change-Id: Ifd8273d6b703110250f2c0210d61599cf6c436d5
 2022-03-31 08:07:16 -07:00
Treehugger Robot
edbb1a9687 Merge "Update OWNERS file to reflect ownership in capability related files" am: c32215ee94 am: e34c026cbb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030804

Change-Id: Ibf50e24133b3c74cb61f59c665262703a5ad6727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 04:58:11 +00:00
Treehugger Robot
c32215ee94 Merge "Update OWNERS file to reflect ownership in capability related files" 2022-03-31 04:17:58 +00:00
joneckenrode
5c907cb5ca Updated API documentation of screenWidthDp and screenHeightDp. 
Bug: 170805355
Test: Built API docs
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: I8ae77784e07c9f9a552da2f3b1d290fac65e0765
 2022-03-28 20:51:06 +00:00
Pinyao Ting
d08b485739 Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." am: 10fc99d0b8 am: b625f5a1d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030444

Change-Id: I12ea26420e292ce069fc1db71be604bbba3bc7de
 2022-03-18 21:41:28 +00:00
Pinyao Ting
42f6b8d71d Update OWNERS file to reflect ownership in capability related files 
Change-Id: I7997705e719f1c9cd5b2d077bf82115698eadbf1
 2022-03-17 17:42:10 +00:00
Pinyao Ting
1234bf12fe Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order. 
Change-Id: I6c247d6df38501b31491ec8cb7b7da7a430b5f1a
 2022-03-17 17:39:47 +00:00
Bernardo Rufino
c2fabc1d4a Merge "Add safer Intent extra APIs and deprecate old ones" am: 30e41a64b2 am: 0b0a4d71a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020758

Change-Id: If0ecedefda7f6311788ad47cc17329d543edc4f6
 2022-03-17 00:35:42 +00:00
Bernardo Rufino
30e41a64b2 Merge "Add safer Intent extra APIs and deprecate old ones" 2022-03-16 23:16:37 +00:00
Bernardo Rufino
a89fede08c Add safer Intent extra APIs and deprecate old ones 
Complementing new safer Bundle APIs introduced in aosp/1988908.

Test: Working on CTS
CTS-Coverage-Bug: 224457848
Bug: 224457848
Change-Id: I1d2b15d1214f2bd2eccade45693365098200ae01
 2022-03-14 09:53:25 +00:00
TreeHugger Robot
fccb9247a6 Merge "Always restart apps if base.apk gets updated." into sc-v2-dev am: 95819b3100 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17112345

Change-Id: I77782a0b88a943902fe66cac657075472028a928
 2022-03-09 06:20:15 +00:00
Alex Buynytskyy
36b0e9e94c Always restart apps if base.apk gets updated. 
Bug: 219044664
Fixes: 219044664
Test: atest PackageManagerShellCommandTest
Change-Id: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
Merged-In: I27a0c5009b2d5f1ea51618b9acfa1e6ccee71296
 2022-03-09 00:47:24 +00:00
Michael Groover
115740d022 Merge "Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."" into sc-v2-dev 2022-03-08 00:42:19 +00:00
Michael Groover
a64720dab3 Merge "Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..."" into sc-v2-dev-plus-aosp 2022-03-08 00:42:19 +00:00
Michael Groover
01c3d11b83 Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..." 
Revert submission 16943318-presubmit-am-bc566b73c1674298b82a1153c03313a1

Reason for revert: This change breaks Better Bug.
Reverted Changes:
I32a2db8c7:[automerge] [DO NOT MERGE]Revert "Relax minimum si...
Ic53d2a361:[DO NOT MERGE]Revert "Relax minimum signature sche...

Bug: 223079119

Change-Id: I987bda9df92543f082700936c20aad06f992bdb0
 2022-03-08 00:05:17 +00:00
Michael Groover
26e383f664 Revert "[automerge] [DO NOT MERGE]Revert "Relax minimum signatur..." 
Revert "[DO NOT MERGE]Revert "Relax minimum signature scheme ver..."

Revert submission 16943318-presubmit-am-bc566b73c1674298b82a1153c03313a1

Reason for revert: This change breaks Better Bug.
Reverted Changes:
I32a2db8c7:[automerge] [DO NOT MERGE]Revert "Relax minimum si...
Ic53d2a361:[DO NOT MERGE]Revert "Relax minimum signature sche...

Change-Id: I847740b01073d4a7adde1e7b80243cd98cf2e722
 2022-03-07 22:15:46 +00:00
Hao Ke
de47f43890 Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 am: ce853414e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550

Change-Id: Iedf232fe99b2e70b3d56c848d213a46dc2593ff6
 2022-03-07 19:19:54 +00:00
Hao Ke
ce853414e6 Merge "Change unsafe readSparseArray call in ApplicationInfo." am: db4e1b7369 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004550

Change-Id: I6e196e5270893bbab37a66c8079e2170cdab0d7d
 2022-03-07 18:47:51 +00:00
Michael Groover
7026055322 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev 2022-03-05 00:02:48 +00:00
Michael Groover
dd244b19a4 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee
  [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"
 2022-03-05 00:02:48 +00:00
Hao Ke
9baf0dc3b1 Change unsafe readSparseArray call in ApplicationInfo. 
Replace the unsafe readSparseArray API call with the typed version.

Bug: 195622897
Change-Id: Ia874fd8e454ddb145d2e999afb08cb79f693566c
Test: Builds and Boots.
 2022-03-01 19:18:16 +00:00
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
Presubmit Automerger Backend
659d441a9c [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: I32a2db8c788ce4a25cdfb0871b725959caacd3ad
 2022-02-22 18:17:19 +00:00
Michael Groover
3c36fd5fee [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 
This reverts commit b71e398935.

Revert reason: System apps should now have uncompressed dex / library
files in their APKs and should be able to satisfy the minimum V2
signature requirement when targeting API level 30+.

Fixes: 215046612
Test: Manually verified V1 only signed APK targeting API level 30
      on the system image failed to verify.
Change-Id: Ic53d2a3614e7dff4e4bfe18561d3dfbb665bbcb2
 2022-02-22 18:17:11 +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
Pinyao Ting
c3ea2d3156 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
(cherry picked from commit e41e04bb8c)
Merged-In:Id262b9a0de58d8834c85d925cf84bb44b8b99742
 2022-02-14 23:12:56 +00:00
Ganesh Olekar
b716ef0497 Validate pid can be trusted 
Bug: 200288596
Test: Manual
Test: atest android.security.cts.AttributionSourceTest#testPidCheck
Change-Id: I07f86ba220bedb1393f4d7ed23175e92d4576601
(cherry picked from commit f29223746d)
Merged-In:I07f86ba220bedb1393f4d7ed23175e92d4576601
 2022-02-14 23:12:46 +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
6e59db1952 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: I930db864b7bb7e90996cb54e8e92a0422e5f3a2c
 2022-02-09 18:10:54 +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
e38b4d59cf 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: I55bd837724c745078138cdbd8afc4213768dcdb1
 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