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

550850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Zach Johnson
8f73278804 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d am: dc08329ee9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: I4738114f56e53db4424671e7034a5d7a03375c1a
 2020-08-20 03:17:16 +00:00
Paul Hu
93b5848141 Revert "[RFPM05] Add UidNetdPermissionInfo class" 
This reverts commit 26263b3cd0.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
 2020-08-20 03:10:08 +00:00
Zach Johnson
dc08329ee9 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: Idcfc40762221d456374fdf7ee3f96123a137a793
 2020-08-20 02:44:09 +00:00
Zach Johnson
e32671c74d Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: Idde2a848c60bef8be4bc253ed77556bdd24ae20c
 2020-08-20 02:32:03 +00:00
Zach Johnson
22399aae26 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" 2020-08-20 02:20:53 +00:00
TreeHugger Robot
846a65236a Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev am: dd5f3cd7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12404422

Change-Id: Ie9889cbcf9875ad462b6224d3fc4ac49d516ee80
 2020-08-20 01:53:31 +00:00
TreeHugger Robot
dd5f3cd7fb Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev 2020-08-20 01:32:33 +00:00
TreeHugger Robot
3e7bf98931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours am: 5dfd565fa3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c8f0c77e525cf0d49b3a4be7a095bf2a763241b
 2020-08-20 00:54:23 +00:00
TreeHugger Robot
84e0e7b3fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours am: ad426ee3f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70cf5455a82bcd82d59fae0da28d759ad4ac5817
 2020-08-20 00:48:55 +00:00
TreeHugger Robot
ad426ee3f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3d81102c604a71fc7b0d1a214a21e0dd9653b70
 2020-08-20 00:44:56 +00:00
TreeHugger Robot
5dfd565fa3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ad8e14fb132d5148d95fd36770967dd473b1c70
 2020-08-20 00:44:55 +00:00
TreeHugger Robot
6540cd4760 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1331b370ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic35970171ae8f55004043635b5ce390dd87a72bb
 2020-08-20 00:44:25 +00:00
TreeHugger Robot
1331b370ec Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-20 00:41:49 +00:00
Louis Chang
cbd20f4438 Merge "Non-priv apps are not allowed to use always/never lock task mode" into rvc-qpr-dev am: b668e7b376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12399059

Change-Id: I07f88d72551c4ac091b5bd8da6bc06596009d8d0
 2020-08-20 00:39:40 +00:00
Louis Chang
b0f7a7abbc Merge "Avoid adjusting top focused root task while clear task" into rvc-qpr-dev am: 84cc3c887d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12399056

Change-Id: I85730707d56a2119200fa18cae694115cce4ca0f
 2020-08-20 00:39:01 +00:00
TreeHugger Robot
f1fa550975 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:34:37 +00:00
Louis Chang
b668e7b376 Merge "Non-priv apps are not allowed to use always/never lock task mode" into rvc-qpr-dev 2020-08-20 00:27:33 +00:00
Louis Chang
84cc3c887d Merge "Avoid adjusting top focused root task while clear task" into rvc-qpr-dev 2020-08-20 00:23:48 +00:00
Zach Johnson
f2a8b85026 Remove listenUsingEncryptedRfcommOn & listenUsingScoOn 
both are hidden and not @UnsupportedAppUsage, so are safe to remove

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I58acb4160207fc0eeaeb7875bfd61f3bd442ad9a
 2020-08-19 16:53:06 -07:00
TreeHugger Robot
e189373a54 Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui" into rvc-qpr-dev am: 44d1900567 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12409872

Change-Id: Ia876a29c72cd61012cbc1e8e1d9d0e49a51ed7a9
 2020-08-19 23:32:06 +00:00