Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
550,872 Commits 3 Branches 0 Tags
a9a83fa9ab1648813ca6389a09b9ef032efb00fb
Commit Graph

550872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Huang
a9a83fa9ab [automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86ca -s ours am: 4bb7c65788 -s ours 
am skip reason: Change-Id Idef314dfe6625399b88b3dacb4c74c7071453497 with SHA-1 533682ebb3 is in history

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

Change-Id: Ic9e7d113c1b5db1f1d2fc3b9e1f09abd68e13c2d
 2020-08-20 11:19:53 +00:00
Tiger Huang
4bb7c65788 [automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86ca -s ours 
am skip reason: Change-Id Idef314dfe6625399b88b3dacb4c74c7071453497 with SHA-1 533682ebb3 is in history

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

Change-Id: I88d6c7c1e0795a4881e660121452508d3d431764
 2020-08-20 11:05:23 +00:00
Tiger Huang
6383ac86ca Merge "Refine system bar position restoring" into rvc-d1-dev 2020-08-20 10:56:44 +00:00
Yo Chiang
2f624e15fd Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e am: 3a3ec27223 am: 07f7f83826 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: Id44cf8686e0f46f3705a52b9bcda041f3f51f5c6
 2020-08-20 09:19:50 +00:00
Paul Hu
ad67c0bbd9 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 am: 45f2280d3a am: 1c66746130 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I8913969ddf7480ad498631db05c9bc84e1d0396a
 2020-08-20 09:19:40 +00:00
Paul Hu
3ad1384309 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b am: bcc1edb897 am: 4f3df4b152 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I123a821f1b121f4ea11dc2a1cb71bf88de409797
 2020-08-20 09:19:14 +00:00
Yo Chiang
07f7f83826 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e am: 3a3ec27223 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I580a7c859f1e343c1704916eab90d9b328ec2bf1
 2020-08-20 09:06:33 +00:00
Paul Hu
1c66746130 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 am: 45f2280d3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: Ie7ac76d52a1bc8e58fc660a86a5f30ab7f2a25b4
 2020-08-20 09:06:22 +00:00
Paul Hu
4f3df4b152 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b am: bcc1edb897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I159f2052d27ad2c923c4463f161fbb3358eb1bb2
 2020-08-20 09:05:53 +00:00
Yo Chiang
3a3ec27223 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I803697de02e4d676f8cd986de8ca7c29bd20a90e
 2020-08-20 08:52:25 +00:00
Paul Hu
45f2280d3a Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I393e91873923d7b6601d4e8c863cca6986f66f23
 2020-08-20 08:52:04 +00:00
Paul Hu
bcc1edb897 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: Ifa19cb8fce8dca66ac5f4ecc7737c1c095b7b35b
 2020-08-20 08:51:45 +00:00
Yo Chiang
dcdec0017e Merge "Post a notification if reboot to DSU failed" am: 5432af8406 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I1b119555630a65a1dec26a14a4cdcda6d9de8151
 2020-08-20 08:34:15 +00:00
Paul Hu
6c6c7cdb81 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484
 2020-08-20 08:33:41 +00:00
Yo Chiang
5432af8406 Merge "Post a notification if reboot to DSU failed" 2020-08-20 08:30:20 +00:00
Paul Hu
4143779e4b Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
 2020-08-20 08:27:16 +00:00
Paul Hu
50bb631f03 Merge "Revert "[RFPM03] Check permission by uid."" 2020-08-20 08:24:30 +00:00
Paul Hu
aad5331ee2 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" 2020-08-20 08:14:48 +00:00
Jason Hsu
34f94de5df [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours am: 0710b9589d -s ours 
am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history

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

Change-Id: I65ab421b637ed3ea15e601c2014f0e38a9abc93c
 2020-08-20 07:59:37 +00:00
TreeHugger Robot
c02befeca2 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: baaf7f8540 am: 21e0928368 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406766

Change-Id: I31efbcb05cd5e748c0bf2653c86a6710cd38276c
 2020-08-20 07:59:11 +00:00
Paul Hu
5ded9f9cca Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 am: 62160754cf am: 1f8fc11362 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I146f4ec57303570d7dc37716882075701d7f32d1
 2020-08-20 07:58:15 +00:00
Jason Hsu
0710b9589d [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours 
am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history

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

Change-Id: I5ebdc744322c6396d4e55c8806249bfdb821d9d5
 2020-08-20 07:46:56 +00:00
TreeHugger Robot
21e0928368 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: baaf7f8540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406766

Change-Id: I51d7b18e3dd4c2ab5f8686189feaf4b30fab7b2f
 2020-08-20 07:46:27 +00:00
Paul Hu
1f8fc11362 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 am: 62160754cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I148fd645e30d866073a883550628f4013569af3c
 2020-08-20 07:45:15 +00:00
Jason Hsu
fc81e4d388 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp 2020-08-20 07:21:21 +00:00
TreeHugger Robot
baaf7f8540 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp 2020-08-20 07:17:54 +00:00
Paul Hu
62160754cf Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I9edf5bfaa9cbc037e87f5781ba07a2c87932f3aa
 2020-08-20 07:04:43 +00:00
Paul Hu
654c328426 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I8cef4a21aa8fd1923334c2a99e4ff2e864f516a5
 2020-08-20 06:44:04 +00:00
TreeHugger Robot
91c1e95fee Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399f2 am: 94fd0add47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: Ibd71fcc20d3a119ac96bd6d90da1a9de8d40e20c
 2020-08-20 06:27:27 +00:00
Jeff Chang
ea10c1e506 [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 31fc73a707 am: 504f2d42dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: Ibb49dcc4b2fa0a9a0cb63161c69ece1b8a7aa632
 2020-08-20 06:27:14 +00:00
Paul Hu
f8115452a7 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" 2020-08-20 06:25:06 +00:00
Paul Hu
7e947abcb5 Revert "[RFPM03] Check permission by uid." 
This reverts commit ab4ad20eef.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7
 2020-08-20 06:23:16 +00:00
Paul Hu
2878288b3a Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method" 
This reverts commit 29100e8892.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed
 2020-08-20 06:23:00 +00:00
TreeHugger Robot
44afc516ba Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399f2 am: 72f4bd6440 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I91f5d3f5d75537ff1febdae7ae9d94f05f7cb800
 2020-08-20 06:21:09 +00:00
Jeff Chang
8bbeede7b9 [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 31fc73a707 am: 58879894aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: Idc8c4cdd4356ef542ebffa01fcd8e0d185f517fb
 2020-08-20 06:20:58 +00:00
TreeHugger Robot
72f4bd6440 Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: Ic370de00d36bb3299f72700eb22c938aa007a4f3
 2020-08-20 06:11:05 +00:00
Jeff Chang
58879894aa [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 31fc73a707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I22df5b5ad174d8fe675400640db804fc6c603138
 2020-08-20 06:10:54 +00:00
TreeHugger Robot
94fd0add47 Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I33bf59bdfa900bf119106106eb70f64df7a8796d
 2020-08-20 06:10:52 +00:00
Jeff Chang
504f2d42dd [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 31fc73a707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I1cc21d2c55d87ef09c8edd607ea5640720a6c948
 2020-08-20 06:10:38 +00:00
TreeHugger Robot
f942b399f2 Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev 2020-08-20 05:58:37 +00:00
Treehugger Robot
1950d8311e [automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours am: 8a72818f65 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc20 is in history

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

Change-Id: Ibb6e437300cba97e85a4d4f6f4574c1018d8c4f8
 2020-08-20 05:00:44 +00:00
junyulai
5f3867e833 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours am: 3256c9ce52 -s ours am: d2eebb8ef2 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf3b is in history

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

Change-Id: Ifd25659b5103031454cb1caa88189798f33b1fbf
 2020-08-20 05:00:30 +00:00
Treehugger Robot
8a72818f65 [automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc20 is in history

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

Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a
 2020-08-20 04:43:44 +00:00
junyulai
d2eebb8ef2 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours am: 3256c9ce52 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf3b is in history

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

Change-Id: I653f77d2f7d5b0b69602ab362888c43c1a2aceb3
 2020-08-20 04:43:33 +00:00
Treehugger Robot
e30e470fab Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
 2020-08-20 04:06:51 +00:00
junyulai
3256c9ce52 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf3b is in history

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

Change-Id: I36cacaf70c7a067fc93d01d0f2c89a90cc2694ae
 2020-08-20 04:06:47 +00:00
Treehugger Robot
363fe9d0b5 Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21
 2020-08-20 03:56:13 +00:00
junyulai
6124af6736 Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I4bfdd2dcc7bd6b1e15248d7ef855fc40db018c4a
 2020-08-20 03:56:10 +00:00
Treehugger Robot
4cea2d3830 Merge changes I0faeda20,I726e74f5 
* changes:
  Add 5G NSA to collapsed RAT types list
  Add getAllCollapsedRatTypes to NetworkTemplate
 2020-08-20 03:44:07 +00:00
Zach Johnson
99666c4572 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d am: dc08329ee9 am: 8f73278804 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: I4a3e0286a58efd79746c767f4e805410ce7fc93b
 2020-08-20 03:27:04 +00:00