Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
586,307 Commits 3 Branches 0 Tags
d4a830a2f8ecbc7c8d7daf79ef2b13dde69bec85
Commit Graph

586307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
d4a830a2f8 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122 am: 7b4ee3d58f am: e1c853be71 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I5bcec14df81f74b913439c98074afee2534862e7
 2020-10-06 18:34:59 +00:00
Chris Tate
afeed1a7e3 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: c162886a3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: I19bc395f02409c21478525766af3dfdde222aaa1
 2020-10-06 18:28:08 +00:00
Amit Mahajan
95e06eec89 Merge "Expose getSmsCapacityOnIcc()" 2020-10-06 18:13:23 +00:00
Tyler Gunn
e1c853be71 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122 am: 7b4ee3d58f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I2c3a42e3681e723e0fe14caa4095caec192df8a1
 2020-10-06 17:47:37 +00:00
Chris Tate
58a104a7ce Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 1cf5e98193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I90dbc7a9ac498306368e707ba35a2ed26c450410
 2020-10-06 17:45:08 +00:00
Nathan Harold
e5ba3fd119 [automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: 1c3a84f72b -s ours 
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 4e0c7d16fd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: I1ab5a5a4feb7e79f9ffc0bf6de147446290343c3
 2020-10-06 17:44:25 +00:00
Eugene Susla
65d966e1d1 Merge "Fix codegen for wildcards in type args" 2020-10-06 17:15:31 +00:00
Chris Tate
c162886a3b Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: I24f3d0bf3e917fc2967348523dfc1017276bc304
 2020-10-06 17:01:50 +00:00
Chris Tate
1cf5e98193 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I62e4bbc63338609847719f76640adaea8c01568b
 2020-10-06 17:01:32 +00:00
Chris Tate
676b35b98e Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: I186d804f3c47caa6b879f5b60713b7adf1ddf2e3
 2020-10-06 16:58:25 +00:00
Tyler Gunn
7b4ee3d58f Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I6e6282829bcb4c3a637a5e1a4bbc2a12644a33d2
 2020-10-06 16:57:17 +00:00
Chris Tate
815ca2d7d8 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923

Change-Id: I2d7340a0279a9e3faa9a96743ea82d8bf4fce3fb
 2020-10-06 16:56:38 +00:00
Nathan Harold
1c3a84f72b Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: If17063ae86087f1c59f493d6ad8ebcc6af55a494
 2020-10-06 16:56:19 +00:00
Chris Tate
02513e4866 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027

Change-Id: Iea4f148d24c3976492c33818894fc11e8a44c71a
 2020-10-06 16:55:53 +00:00
Chris Tate
e174ab0148 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev 2020-10-06 16:42:56 +00:00
Chris Tate
985f7b1d53 Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev 2020-10-06 16:42:48 +00:00
Tyler Gunn
0c1a841122 Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777

Change-Id: I6277cd5b2fc432dcf8aeefe0088c5ba25095f300
 2020-10-06 16:35:38 +00:00
Nathan Harold
21a1916717 Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev 2020-10-06 16:30:33 +00:00
David Su
a3e52bf4e4 Merge "Migrate existing Build.VERSION.SDK_INT checks to SdkLevelUtil" 2020-10-06 16:15:18 +00:00
Tyler Gunn
2046a9dced Merge "Make android.telecom.action.POST_CALL a protected broadcast." 2020-10-06 16:12:23 +00:00
TreeHugger Robot
0572a76bc1 Merge "Addressing API review comments." 2020-10-06 15:24:53 +00:00
Lyn Han
13f56b66b0 Merge "Update flyout post fontScale change" 2020-10-06 15:03:39 +00:00
Abhijeet Kaur
61ec04bb15 [automerger skipped] Validate user-supplied tree URIs in DocumentsProvider calls am: eca247f2d3 am: 22a3dede66 -s ours 
am skip reason: Change-Id I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41 with SHA-1 b9f4fb7928 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513169

Change-Id: Ie04c7459507a9a17283bf329674b4a93aca51f83
 2020-10-06 14:31:42 +00:00
Abhijeet Kaur
22a3dede66 Validate user-supplied tree URIs in DocumentsProvider calls am: eca247f2d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513169

Change-Id: Ibc90fe5e176678bf3a10e5a876e3a5da772302ee
 2020-10-06 14:00:53 +00:00
Mohammad Islam
d46b73cace [automerger skipped] Merge "Rewrite how we abandon sessions" am: f9e818047f am: 7fdd370876 am: 208826a508 -s ours am: 0827cf25d2 -s ours 
am skip reason: Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 e3a71c6295 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433442

Change-Id: Ia95852e749ed376f5adff2bc2608bc07701ca559
 2020-10-06 13:53:50 +00:00
Mohammad Islam
0827cf25d2 [automerger skipped] Merge "Rewrite how we abandon sessions" am: f9e818047f am: 7fdd370876 am: 208826a508 -s ours 
am skip reason: Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 e3a71c6295 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433442

Change-Id: I44e02f2b87074dbca109309eda28cdd8fa07cbb2
 2020-10-06 13:15:28 +00:00
Treehugger Robot
e7cd509cf1 Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 am: 055310bc2f am: 88f5094c1b am: 99a668c80a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433918

Change-Id: I5754bdb872595922f30135613abeb2930ff1c650
 2020-10-06 12:42:14 +00:00
Eran Messeri
f4f7d17bc2 Merge "Refactoring: Use explicit methods for checking DO/PO" 2020-10-06 12:36:16 +00:00
Mohammad Islam
208826a508 Merge "Rewrite how we abandon sessions" am: f9e818047f am: 7fdd370876 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433442

Change-Id: Iba8e770c40c83c1d65df496b88410ba07ef73753
 2020-10-06 12:35:42 +00:00
Treehugger Robot
99a668c80a Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 am: 055310bc2f am: 88f5094c1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433918

Change-Id: If99df2f7a3376e2514babf726e9f6ee73205c7f2
 2020-10-06 12:23:59 +00:00
Abhijeet Kaur
eca247f2d3 Validate user-supplied tree URIs in DocumentsProvider calls 
Currently we only validate DocumentsContract.EXTRA_URI, this change
validates other URIs suchs as DocumentsContract.EXTRA_TARGET_URI and
DocumentsContract.EXTRA_PARENT_URI as well

Bug: 157320716
Test: Manually using the test app in b/157320716#comment1
Change-Id: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
Merged-In: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
(cherry picked from commit b9f4fb7928)
 2020-10-06 12:12:35 +00:00
Riddle Hsu
ef639776ce Merge "Verify the exact display count for display window listener test" 2020-10-06 12:10:46 +00:00
Mohammad Islam
7fdd370876 Merge "Rewrite how we abandon sessions" am: f9e818047f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433442

Change-Id: I42a249be96a06f4c99ed38486d5cb64d501b72cd
 2020-10-06 11:49:08 +00:00
Treehugger Robot
88f5094c1b Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 am: 055310bc2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433918

Change-Id: I10fef610f00d88694551ac00255ebbe5f82ed9e0
 2020-10-06 11:42:21 +00:00
Mohammad Islam
f9e818047f Merge "Rewrite how we abandon sessions" 2020-10-06 11:24:08 +00:00
Abhijeet Kaur
d5a24b92df [automerger skipped] Merge "Validate user-supplied URIs in DocumentsProvider calls" into rvc-qpr-dev am: 249b137d92 am: 1507e59477 -s ours 
am skip reason: Change-Id I799509ed5ff7e69140e84d796fe7f96d9dbfd32f with SHA-1 75f984bd32 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515255

Change-Id: I89ba7fc1bcb42a9c038e80d0ca09972f0291898d
 2020-10-06 11:12:54 +00:00
Treehugger Robot
055310bc2f Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433918

Change-Id: I884d8d9efee65d75ca63dd7d51c9731bfaba3af8
 2020-10-06 11:05:04 +00:00
Abhijeet Kaur
1507e59477 Merge "Validate user-supplied URIs in DocumentsProvider calls" into rvc-qpr-dev am: 249b137d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515255

Change-Id: If6eace10dd76208e82070409a45f3643229d6bb3
 2020-10-06 10:53:39 +00:00
Treehugger Robot
e50b18b0c6 Merge "Add synchronized to make sure data correctness" 2020-10-06 10:47:33 +00:00
Abhijeet Kaur
249b137d92 Merge "Validate user-supplied URIs in DocumentsProvider calls" into rvc-qpr-dev 2020-10-06 10:17:23 +00:00
Riddle Hsu
b96513095f Verify the exact display count for display window listener test 
Even in unit test, RootWindowContainer#setWindowManager still adds
the displays from the real display manager. If the testing device
has more than 1 display, the test will fail.

Bug: 169809706
Test: Enable simulated display and run
      atest ActivityTaskManagerServiceTests#testDisplayWindowListener
Change-Id: I3aa53d3a0f1907083b748abfc2fb2803040c95dc
 2020-10-06 17:42:24 +08:00
TreeHugger Robot
58686805ae Merge "Various location fixes" 2020-10-06 09:41:06 +00:00
Mohammad Samiul Islam
bb81317c53 [automerger skipped] Merge "Rewrite how we abandon sessions" into rvc-qpr-dev-plus-aosp am: f827bb5a82 -s ours 
am skip reason: Change-Id Ib7b32fbd7b1133ac6a8e6782234a4fe2c5a782bd with SHA-1 3ac333f2d2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12765157

Change-Id: I7eef377a95650bf5d0f23f0b5d8ae0bb56288954
 2020-10-06 09:35:25 +00:00
Eran Messeri
4634589e41 Refactoring: Use explicit methods for checking DO/PO 
Do not use USES_POLICY_PROFILE_OWNER / USES_POLICY_DEVICE_OWNER.
Instead, use explicit methods for checking if the caller is
the Device Owner or Profile Owner.

USES_POLICY_PROFILE_OWNER is confusing since internally in the
DevicePolicyManagerService, it implied a Device Owner is also a
Profile Owner, which is not always what the caller expected.

This is the first phase of the refactoring, removing external calles'
dependency on these constants. The next phase will remove them
internally completely in favour of an implementation that
accesses mOwners directly.

There are no functional changes in this CL.

Bug: 163028934
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I57c8465d190a3b4b130d57fd622cc93eaeb9c717
 2020-10-06 10:34:23 +01:00
TreeHugger Robot
24bb806b68 Merge changes from topic "required-feature-tag" 
* changes:
  Teach PackageManager to handle <required-(not-)feature>
  Teach appt2 to handle <required-(not-)feature>
 2020-10-06 09:26:22 +00:00
Mohammad Samiul Islam
b522c02e47 Merge changes from topic "app-staging" 
* changes:
  Reverify certain conditions during staged install
  Ensure staged sessions are not installed in app-staging directory
  Stop creating extra apk session during post-reboot install phase
 2020-10-06 09:15:39 +00:00
Mohammad Samiul Islam
f827bb5a82 Merge "Rewrite how we abandon sessions" into rvc-qpr-dev-plus-aosp 2020-10-06 09:02:56 +00:00
Neil Fuller
dcd5a9cbb2 Merge "Expose the LTZP in the location provider API" 2020-10-06 08:49:40 +00:00
TreeHugger Robot
6be96e0780 Merge "Add shouldDisableMediaOutput() on LocalMediaManager" 2020-10-06 08:40:14 +00:00
Neil Fuller
2113fd06e5 Merge "Secondary LocationTimeZoneProvider config changes" 2020-10-06 08:38:45 +00:00