Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Max Bires
fa76c6628e Adding TEST_MAPPING to frameworks/base/keystore 
This file maps to about 4 minutes and 15 seconds of tests within
Keystore to be added to presubmit.

Fixes: 158797959
Test: atest --test-mapping
Change-Id: Ib40cc5106277ca25e08f6922a840924bd6ce4cf3
 2020-08-20 00:42:50 -07:00
jasonwshsu
7f6998afe2 Update language to comply with Android's inclusive language guidance 
1. Rename isClientInWhitelist to isClientInAllowlist

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 162536543
Test: Build & run
Change-Id: If9c5a2599e13633d6e99993d857e2101b4e6e4ec
Merged-In: Ibbd97bf31915d59b5110cbcc8f2126f7a7221060
Merged-In: I915e09e4e64d5c268630cec2d0ef05ea0592fd6f
Merged-In: I499c4574464862f3a1dcea2c6d51813e23ba4b82
 2020-08-20 07:22:25 +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
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
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
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
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
junyulai
eed8c6bb26 Notify the keepalive is stopped after the slot has been released 
Currently, the callbacks of stopping were fired when stop procedure
is started, because the upper layer apps only care about the reason
of stopping instead of stopping result. Thus, there is no need to
wait for the result comes back. However, this behavior generates
races if apps want to re-start keepalive immediately since the
resources are not released yet.

Fix: 134891441
Fix: 140305589
Test: atest com.android.server.ConnectivityServiceTest#testPacketKeepalives \
      --rerun-until-failure 1000

Change-Id: I987776a9211a50e964c4675b747bc10e203750f1
 2020-08-20 11:00:08 +08: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
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
f1fa550975 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:34:37 +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
a0421d89ba Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 am: 3e1b131387 am: 2206e69609 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396951

Change-Id: Ie7af7ca6aea533731b06654e80a70da36c1e77dd
 2020-08-19 23:10:05 +00:00
Liam Harrington
ce63713955 Switch to callback animation 
Modified current animation logic to use callbacks from the controllers
to further clean and modularize code.
Test: Pixel 3XL device, atest PointerController_test, compile

Change-Id: I1073bd78687cca491663c0349751dab4b30aa8e2
 2020-08-19 23:02:09 +00:00
Treehugger Robot
2206e69609 Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 am: 3e1b131387 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396951

Change-Id: Iab8643f7f4c73e27b492e62128135403bb565d7e
 2020-08-19 22:58:14 +00:00
Treehugger Robot
3e1b131387 Merge "IorapForwardingService: Suppress error log" am: c20242f7e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1396951

Change-Id: Iab9bedeb2b114c02f24babbffb30fae3824e2386
 2020-08-19 22:46:29 +00:00
Treehugger Robot
be1237a0b4 Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 am: 7c40bef8d7 am: d60c6365fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404077

Change-Id: I5a9acb5afb33c6cfb94b931ca80e1cce8ed3b939
 2020-08-19 22:41:02 +00:00
Treehugger Robot
c20242f7e6 Merge "IorapForwardingService: Suppress error log" 2020-08-19 22:07:13 +00:00
Treehugger Robot
d60c6365fa Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 am: 7c40bef8d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404077

Change-Id: Ib94d193de1d8a77e83cf9dce799be48d5115e15f
 2020-08-19 21:21:41 +00:00
Treehugger Robot
7c40bef8d7 Merge "Removes unnecessary weak reference on the java object associated with" am: 244406a4f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404077

Change-Id: I65b348d0cdec8bef4835e01bd4cc39bd0e848bb9
 2020-08-19 21:10:18 +00:00
Treehugger Robot
244406a4f5 Merge "Removes unnecessary weak reference on the java object associated with" 2020-08-19 20:57:49 +00:00
yawanng
aeec6c8ff5 IorapForwardingService: Suppress error log 
Bug: 160381575
Test: make
Change-Id: Iee7506205edc2863c76d0dae0568297565def3df
 2020-08-19 19:50:09 +00:00
Bill Yi
48c13b4f9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36607eb2b8dca3dcf95e435d6decc44ab686cfb3
 2020-08-19 18:39:40 +00:00
TreeHugger Robot
d58e211dec Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608

Change-Id: I867ca42c8af309369b0da2c497e9b98bd48d29d6
 2020-08-19 16:19:51 +00:00
Tiger Huang
444e8dc6ce Refine system bar position restoring 
The previous logic restores the system bar as long as its insets source
is visible. There can be a timing issue that if the user swipes to show
transient bars while an immersive app just becomes the control target
but the hide-bar info haven't sent to WM yet, WM will re-show the bar
incorrectly.

This CL uses the requested visibility and the behavior to decide if we
should restore the postion and the visibility.

This CL also refines and caches the arguments of showTransient. In this
way, we don't have to create the array every time while invoking that
method.

Fix: 161247175
Test: atest InsetsPolicyTest
Merged-In: Idef314dfe6625399b88b3dacb4c74c7071453497
Change-Id: Idef314dfe6625399b88b3dacb4c74c7071453497
(cherry picked from commit 533682ebb3)
 2020-08-19 16:13:25 +00:00
TreeHugger Robot
af90f3fe7e Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev 2020-08-19 16:10:26 +00:00
Tiger Huang
02b0205641 Update requested state after applying pending frames am: 23c75281ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400337

Change-Id: I955a32723913c7cc238ce38e8c97328295dae27c
 2020-08-19 15:58:11 +00:00
Andreas Huber
29f2c0dc83 Removes unnecessary weak reference on the java object associated with 
JHwRemoteBinder.

Bug: 161964661
Test: system/tools/hidl/test/run_all_device_tests.sh
Change-Id: Ia08e64bd4df87f1604f26ffa64d799131cc31f53
 2020-08-19 08:46:23 -07:00
Tyler Gunn
827314c594 Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 am: 8ef5d0eb2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369

Change-Id: I98d0a95c48f8fde725490d44403c0720c147f59d
 2020-08-19 15:30:23 +00:00