Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
723,833 Commits 3 Branches 0 Tags
2f60592bd450ebcda6def2fbcf5cdccfaeb4ef41
Commit Graph

723833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2f60592bd4 [automerger skipped] Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b1090499 am: 35700e13a7 am: 89ecd315be -s ours 
am skip reason: Merged-In I3ed502a078eebac62e0b8a27f6302410c22111e4 with SHA-1 c36fe9b724 is already in history

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

Change-Id: Ie08e972e108bb9bd96080841395ae68c0372d30d
 2021-10-04 17:38:25 +00:00
TreeHugger Robot
a646213432 Merge changes from topic "dozeTapGesture_dualDisplaySupport" into sc-v2-dev am: a2fb749631 am: fa69d14957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15933708

Change-Id: Ie7a182b3694401a2cbbb223831425cf69e961fdc
 2021-10-04 17:36:13 +00:00
TreeHugger Robot
46da85a3cd Merge "Revert "Fixed DPMS.setDeviceOwner() permission check."" into sc-v2-dev am: 71fb7767d4 am: f25d6c001b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15942864

Change-Id: I2caa090b7c629865132b0282239dd1259262c7d9
 2021-10-04 17:35:27 +00:00
TreeHugger Robot
ab59f5c03f [automerger skipped] Merge "Added a DevicePolicyManager.setDeviceOwnerOnly() method." into sc-v2-dev am: 442864cace am: 8463df1a9a -s ours 
am skip reason: skipped by user felipeal

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

Change-Id: I4b448c92e26a83c62addd2a26abf47e9d6fb7660
 2021-10-04 17:34:38 +00:00
TreeHugger Robot
c371b1d446 Merge "Added a DevicePolicyManager.setDeviceOwnerOnly() method." 2021-10-04 17:30:59 +00:00
Adam Bookatz
baa37ca7cb Merge "UserManager more consistently @UserHandleAware" 2021-10-04 16:05:34 +00:00
Mark Renouf
c1512c20e5 Merge "Fix UsbResolverActivity: SuperNotCalledException" 2021-10-04 15:19:52 +00:00
Martijn Coenen
bf23230dc0 Merge "Throw DeadSystemRuntimeException when system_server dies." 2021-10-04 06:58:21 +00:00
TreeHugger Robot
5e92df0055 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f093f0d0dc -s ours am: 6e77619492 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic64bedfcbc7e4972a363e2a086774ba0a1d8041c
 2021-10-02 23:08:15 +00:00
TreeHugger Robot
737a230b49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b58ae99be4 -s ours am: 21c38a406c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18881f1b7c64f7508489fdac272b2191ba0498bf
 2021-10-02 23:08:04 +00:00
TreeHugger Robot
5aa3993768 Merge changes from topic "presubmit-am-f13c035a5b3e49f48c5507317e3c0aaf" into sc-mainline-prod am: 21bc7cc904 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960218

Change-Id: Ib2b057a8617a14a885c21a0055f12fb731967c64
 2021-10-02 23:07:44 +00:00
TreeHugger Robot
9cac88a61f Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into sc-mainline-prod am: 1640f163df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15962895

Change-Id: If95fd2ceef49e55c4df81b3d3ccc9bfca0754f39
 2021-10-02 23:06:48 +00:00
TreeHugger Robot
6e77619492 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f093f0d0dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaefe9969e015c2bdee397d0068d43bca0823b9d7
 2021-10-02 23:06:35 +00:00
TreeHugger Robot
21c38a406c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b58ae99be4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8156bec54dd04975bd2abf8108a7923cf23986b5
 2021-10-02 23:06:14 +00:00
TreeHugger Robot
21bc7cc904 Merge changes from topic "presubmit-am-f13c035a5b3e49f48c5507317e3c0aaf" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c9a21ae83
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 23:01:58 +00:00
TreeHugger Robot
ce24675a84 Merge changes from topic "presubmit-am-f13c035a5b3e49f48c5507317e3c0aaf" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c9a21ae83 2p: 5bb3cdb31d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c9a21ae83
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 23:01:58 +00:00
TreeHugger Robot
f093f0d0dc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-02 23:01:58 +00:00
TreeHugger Robot
1640f163df Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49ff6b02d9
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 22:53:52 +00:00
TreeHugger Robot
b58ae99be4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-02 22:53:52 +00:00
TreeHugger Robot
e1620fb38a Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49ff6b02d9 2p: be309ce0fe
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49ff6b02d9
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 22:53:52 +00:00
Bill Yi
aa4eb52c46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: c0591d70ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cc7c317ae531a0f079ea3f451ec3f9659ad76c8
 2021-10-02 21:54:15 +00:00
Bill Yi
c0591d70ab Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 21:46:08 +00:00
Bill Yi
dded9d60a6 Merge changes from topic "presubmit-am-d7255652ace3435fb8ce23ab217c9154" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5172184066
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 21:46:08 +00:00
TreeHugger Robot
75859add09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d4e0ba5aea -s ours am: efb3d18ae2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fb970152019d1d12d15db1c9a56bcd09265de8a
 2021-10-02 18:00:47 +00:00
TreeHugger Robot
45fe9d2bfb Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-mainline-prod am: 655feee49d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960232

Change-Id: Ie7bb3cded0533d5757d9ea5cc297b6aebd12fac4
 2021-10-02 18:00:29 +00:00
TreeHugger Robot
efb3d18ae2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d4e0ba5aea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0a41007a1e6bb9715c7aa7c4cfbb7b5f9423d81
 2021-10-02 18:00:11 +00:00
TreeHugger Robot
d4e0ba5aea Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-02 17:49:17 +00:00
TreeHugger Robot
17dbb56e4d Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 2p: 19cc11f443
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 17:49:17 +00:00
TreeHugger Robot
655feee49d Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 17:49:17 +00:00
Bill Yi
ae557f067a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 16:34:23 +00:00
TreeHugger Robot
d26ca7d927 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 965c049c07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d8675fff74fe3ce6fc0a291dd0f6903c30eb736
 2021-10-02 09:23:55 +00:00
TreeHugger Robot
965c049c07 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 09:12:59 +00:00
TreeHugger Robot
bd260ccf06 Merge changes from topic "presubmit-am-f1204d8f9abe4b26a7b30d02cbfef8c4" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1c362c99c
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 09:12:59 +00:00
TreeHugger Robot
45287a9971 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 09:04:13 +00:00
TreeHugger Robot
b4023c56b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d1bb47345d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9abc1ea1300101a27429ff23bd5bf1ae75499d42
 2021-10-02 08:10:33 +00:00
TreeHugger Robot
22fae928e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0aa9fdd9c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e341e6e3cfba76e7400f72b9e4f081d6544417d
 2021-10-02 08:09:25 +00:00
TreeHugger Robot
d1bb47345d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 07:58:47 +00:00
TreeHugger Robot
3963ffb3e7 Merge changes from topic "presubmit-am-57e77ba2643340768cd486f43a54b29a" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 043bdfb3c0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 07:58:47 +00:00
TreeHugger Robot
0aa9fdd9c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 07:54:44 +00:00
TreeHugger Robot
ebe15ce76e Merge changes from topic "presubmit-am-ecf0dda706ee46a9b0c9658a248e3292" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4664b90670
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 07:54:44 +00:00
TreeHugger Robot
2f760bfce9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 07:35:12 +00:00
TreeHugger Robot
1523c3a079 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 07:13:14 +00:00
TreeHugger Robot
78cbb9d7d9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 06:53:32 +00:00
Bill Yi
55cb0e46a6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49ff6b02d9 2p: be309ce0fe 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ib079ad772680ead0196c09e25fdfd3d57466aea0
 2021-10-02 03:51:15 +00:00
Bill Yi
be309ce0fe [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49ff6b02d9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6b9fd57b83aff3f300f8e7a3c3714ad7f8ec2ff4
 2021-10-02 03:51:10 +00:00
Bill Yi
49ff6b02d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibfe69cbbbc4dda4bc627fbf49faafb58746acde0
 2021-10-02 03:50:11 +00:00
Bill Yi
d0da80fdcd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5013d5de42cbc48732563241759e8f73a99486e1
 2021-10-02 03:46:06 +00:00
Bill Yi
c06a1f644e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5172184066 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib288f49b064b6fa066e576b06d5a181e40688e55
 2021-10-02 03:39:24 +00:00
Bill Yi
5172184066 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4db318475bc36db5df21a06d1948beac294122be
 2021-10-02 03:38:21 +00:00
Evan Severson
2c357a62f6 Merge "Refactor sensor use dialog to show above applications" into sc-dev am: 10670dd872 am: 7ef20c8744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15851330

Change-Id: I6e7204df1ebafc941b91092e6be3aacc17b4645f
 2021-10-02 00:08:35 +00:00