Commit Graph

8362 Commits

Author SHA1 Message Date
Jeff Sharkey
a7913a0656 Merge "Expose VPN_UID" am: 58f7a60187 am: 8710bc1755
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625699

Change-Id: Idb15fe2671eac19159cc7f58319cdff7d4663bee
2021-03-17 22:00:22 +00:00
Peter Collingbourne
1dec957d68 Merge "Add support for a hw_timeout_multiplier system property." am: 7fe1ca63df am: 3c8dbe30d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556750

Change-Id: Iaec0f4e259ebb1251c534fbf01081f89272c44b7
2021-03-17 20:49:31 +00:00
Jeff Sharkey
58f7a60187 Merge "Expose VPN_UID" 2021-03-17 20:38:41 +00:00
Peter Collingbourne
7fe1ca63df Merge "Add support for a hw_timeout_multiplier system property." 2021-03-17 18:18:51 +00:00
lucaslin
e4ea3d4c84 Expose VPN_UID
ConnectivityService will be a part of mainline module, so it
cannot access hidden API. Expose VPN_UID for ConnectivityService
to access.

Bug: 170598012
Test: m
Change-Id: I9f74fb97ba27e5feacf1820cf75e28ad73516d7d
2021-03-17 19:04:01 +08:00
Treehugger Robot
de535f6eb2 Merge "Use ro.boot.qemu to check if the device is an emulator" am: 62d82e0b33 am: 4ba8fde9ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662

Change-Id: I039b17ca0bf956ee3d86c72edcbf81957938ae4b
2021-03-16 17:17:20 +00:00
Peter Collingbourne
6353c57d57 Add support for a hw_timeout_multiplier system property.
In order to test the platform in emulators that are orders of magnitude
slower than real hardware we need to be able to avoid hitting timeouts
that prevent it from coming up properly. For this purpose introduce
a system property, ro.hw_timeout_multiplier, which may be set to
an integer value that acts as a multiplier for various timeouts on
the system.

Bug: 178231152
Change-Id: I6d7710beed0c4c5b1720e74e7abe3a586778c678
Merged-In: I6d7710beed0c4c5b1720e74e7abe3a586778c678
2021-03-11 14:04:18 -08:00
Roman Kiryanov
d6a9f42566 Use ro.boot.qemu to check if the device is an emulator
`ro.kernel.qemu` is deprecated.

Bug: 182291166
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Id42d79af90b1fe7e182a96c53c84248e81a7c259
2021-03-10 23:41:31 -08:00
Jeff Sharkey
5c1ad2c60d Merge "Make FileUtils#createDir threadsafe" am: 5232082243 am: bc1b11029b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id70ab2f8c4a73d74e6b0e63353e66521bd6c3581
2021-03-10 23:34:36 +00:00
Jeff Sharkey
5232082243 Merge "Make FileUtils#createDir threadsafe" 2021-03-10 22:02:14 +00:00
Jeff Sharkey
dce433b181 Merge "Update OWNERS file for GraphicsEnvironment" am: 5b7186f65d am: f4a2795bb8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9be0b00869616ae72f6a51be4732693b7f66b22
2021-03-09 19:59:04 +00:00
Jeff Sharkey
5b7186f65d Merge "Update OWNERS file for GraphicsEnvironment" 2021-03-09 18:40:42 +00:00
Yiwei Zhang
0400f05249 Update OWNERS file for GraphicsEnvironment
Test: build
Change-Id: I077a9ea03ada04608396f40f153527cc22ea83ca
2021-03-09 18:25:37 +00:00
Lais Andrade
3afe20a305 Merge "Clarify delay parameter documentation in VibrationEffect" am: 2b9f0c7623 am: cdbc51fa52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4b8b136fae23b31a4f20ad54e66104876745b1
2021-03-09 13:05:43 +00:00
Aaron Huang
3913bb35c1 Add a new API in BatteryStatsManager for connectivity service am: 3ae5bdab6e am: 584e64df05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4f99588f81a9545e91593311d6d4e8e6c64659e
2021-03-09 11:49:44 +00:00
Lais Andrade
2b9f0c7623 Merge "Clarify delay parameter documentation in VibrationEffect" 2021-03-09 11:46:43 +00:00
Aaron Huang
584e64df05 Add a new API in BatteryStatsManager for connectivity service am: 3ae5bdab6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97fc5426d302d6084e8434daa3f6c9b2389be449
2021-03-09 11:11:49 +00:00
Aaron Huang
c4f2a30c20 Merge changes I1d1f0d2d,Ifbd4a978
* changes:
  Communicate with BatteryStatsService through BatteryStatsManager
  Add a new API in BatteryStatsManager for connectivity service
2021-03-09 10:33:56 +00:00
Aaron Huang
3ae5bdab6e Add a new API in BatteryStatsManager for connectivity service
Connectivity service(CS) is going to be a mainline module and
currently it uses IBatteryStats to communicate with battery
stats service directly. CS cannot use this way after becomes
a mainline module so add new system APIs to communicate with
battery stats service through BatteryStatsManger.

The new API reportNetworkInterfaceForTransports requires
system-only permission NETWORK_STACK or MAINLINE_NETWORK_STACK
so that given the only caller was in ConnectivityService.

This change only add new surface, the usage in CS will be
updated in follow-up CL.

Bug: 171686421
Test: builds, boot, mobile and wifi work.
Change-Id: Ifbd4a9784ed7664751e69d530f8204e292fa6b39
Merged-In: Ifbd4a9784ed7664751e69d530f8204e292fa6b39
2021-03-09 06:24:50 +00:00
Makoto Onuki
245befadf1 Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" am: 4d83226663 am: 8f8ffd02f2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff6dfbeda11d1ae6fd6cd9a28cd622f2cec7045
2021-03-09 02:19:25 +00:00
Makoto Onuki
4d83226663 Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state" 2021-03-09 01:10:27 +00:00
Lais Andrade
66a26003e8 Clarify delay parameter documentation in VibrationEffect
Make it clear in the javadoc for addPrimitive method the start point of the delay parameter, which is right after the previous primitive in the composition has finished.

Fix: 150715908
Test: N/A
Change-Id: Ic88b0d8a31a193b8b1726a9541d9e5955b729866
2021-03-09 00:22:45 +00:00
Jacob Abrams
1d5dbcaaf4 Make FileUtils#createDir threadsafe
Prior to this change the createDir method would return false if invoked
around the same time on two different threads for the same directory.

Test: manual
Change-Id: I34ba4f645a034f47917054af4b299f916a9cfa67
2021-03-08 14:35:44 -08:00
Christian Wailes
87287a5859 Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d am: a534c95087
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06eb075d11b110ccbbd8dcaecb948e502d69f6bb
2021-03-05 05:10:07 +00:00
yuxi1
409fcc7207 [Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state
After performing adb shell am hang and kill this process, the phone can not resume from hang state. The reason is that the IBinder object in runHang(PrintWriter pw) of ActivityManagerShellCommand.java is not the IBinder object of client.

Bug: 180949375
Fixes: 180949375

Test: Run adb shell am hang, and open some APPs, then the phone will hang. Then perform ctrl + c, the phone can resume from hang state.

Signed-off-by: yuxi1 <yuxi1@xiaomi.com>
Change-Id: Ie1153df2e21fc267fd131994422b7c263a17372a
2021-03-05 02:49:58 +00:00
Christian Wailes
db6628bb7d Merge changes I04ac8fba,Ia0a8548f
* changes:
  Autoformatter changes.
  Inclusivity cleanup of the Zygote.
2021-03-04 21:09:52 +00:00
Remi NGUYEN VAN
043099e934 Merge "Add Build.IS_DEBUGGABLE to public API" am: 9c16d8e25d am: 739f8a3fb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19e099baa632221842cf1687fbef0bad06fda060
2021-03-04 04:23:30 +00:00
Remi NGUYEN VAN
9c16d8e25d Merge "Add Build.IS_DEBUGGABLE to public API" 2021-03-04 03:02:56 +00:00
Chris Wailes
a6f8803c85 Inclusivity cleanup of the Zygote.
Changed "whitelist" to "allowlist" in many Zygote files.

BYPASS_INCLUSIVE_LANGUAGE_REASON="compatability with vendor files"

Test: cts
Change-Id: Ia0a8548f2e254fc36a9dce7e50af8284ed0caa47
2021-03-03 14:23:32 -08:00
Remi NGUYEN VAN
e5e3843176 Add Build.IS_DEBUGGABLE to public API
For testing purposes, system components such as mainline modules may
need to relax some security restrictions on debuggable builds only, in
cases where there is no testing strategy that would be reasonable on
user builds security-wise.
One example is to test interfaces between a mainline module and the
rest of the system, which typically require very privileged permissions.

There is no particular reason or permission check to keep the symbol
non-public so add it to the public API.

Test: m
Fixes: 163699557
Change-Id: I15c093af04f024eed5567151b241a4bc35c611d4
2021-03-03 11:16:35 +09:00
Patrick Baumann
2d55bda434 Merge "Adds caller check to getAllPackages()" into rvc-qpr-dev am: ec4ba204d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13617976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iceb77ee1f663833202421151654151893b68ea72
2021-03-02 23:51:52 +00:00
Abhijeet Kaur
b68c51d4c4 Merge "Removed unused mount mode constants" am: 14f35d5f2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d0c585e742f33ce90fac787f54b5c0903f070f
2021-03-02 20:59:46 +00:00
Remi NGUYEN VAN
6dd910c726 Merge "Move UidRange to connectivity" am: 5a81037576 am: 4f6f17230f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5
2021-03-02 20:43:46 +00:00
Remi NGUYEN VAN
4f6f17230f Merge "Move UidRange to connectivity" am: 5a81037576
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
2021-03-02 20:24:20 +00:00
Chiachang Wang
089104cf50 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib734109b5f2e6acb26e25e65139890415dfb0bc2
2021-03-02 19:50:50 +00:00
Chiachang Wang
fed4ec6ff6 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa
2021-03-02 19:22:34 +00:00
Abhijeet Kaur
14f35d5f2d Merge "Removed unused mount mode constants" 2021-03-02 16:37:30 +00:00
Abhijeet Kaur
d41a537ed0 Merge "Removed unused mount mode constants" into rvc-qpr-dev-plus-aosp 2021-03-02 13:54:01 +00:00
Remi NGUYEN VAN
5a81037576 Merge "Move UidRange to connectivity" 2021-03-02 09:27:50 +00:00
Remi NGUYEN VAN
c983440dd8 Move UidRange to connectivity
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.

Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.

Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Chiachang Wang
0d7553b30e Merge changes Ifc561b6d,I63137b24
* changes:
  Remove RouteInfo hidden depdendency in NMS
  Remove the hidden ConnectivityManager dependency in NMS
2021-03-02 05:13:22 +00:00
Hunter Knepshield
0f5e18a9f0 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71f11a4a2ecec595a428f611d5bf62181a5e18d4
2021-02-26 19:12:00 +00:00
Hunter Knepshield
b79c80ba78 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0c2b746e1be4944a6caa05c6764f37cf960bace
2021-02-26 18:52:56 +00:00
Hunter Knepshield
39742a519c Merge "[API review] Additional detail in BugreportCallback javadoc." 2021-02-26 18:31:22 +00:00
Almaz Mingaleev
08f03dc59c Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25dc972b3303e1950eb8a7192852876e2e1fad5b
2021-02-26 10:05:16 +00:00
Almaz Mingaleev
c76d1a4c26 Merge "Re-throw system server exception." am: 112cd8df86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39697856d7fee18200e7405d84a45add58d60921
2021-02-26 09:19:15 +00:00
Almaz Mingaleev
112cd8df86 Merge "Re-throw system server exception." 2021-02-26 08:42:36 +00:00
Hunter Knepshield
433d357604 [API review] Additional detail in BugreportCallback javadoc.
This covers edge cases left out of the previous generalization.

Bug: 180015324
Test: make
Change-Id: I309d17cd09434469b5d88275cd59e864f4830c3a
2021-02-25 23:16:20 +00:00
Zim
6d5527d540 Removed unused mount mode constants
Since FUSE in R, there are only 4 mount modes that are used
from IVold.aidl:

REMOUNT_MODE_NONE
REMOUNT_MODE_DEFAULT
REMOUNT_MODE_INSTALLER
REMOUNT_MODE_PASS_THROUGH
REMOUNT_MODE_ANDROID_WRITABLE

Bug: 148454884
Test: Manual
Change-Id: I62b66083f2099b429474872b6f9c7cffb9fb906d
Merged-In: I62b66083f2099b429474872b6f9c7cffb9fb906d
(cherry picked from commit c8fe3d2acd)
2021-02-25 15:22:06 +00:00
Almaz Mingaleev
b0d08720dc Re-throw system server exception.
Previous "return 0" was not reachable, this makes intention
cleaner.

Bug: minor cleanup
Test: TH only
Change-Id: I50d7d1a2ed53b8f8fe245c6ac6aad4fb8b4ce6e3
2021-02-25 15:13:26 +00:00