Commit Graph

6923 Commits

Author SHA1 Message Date
Automerger Merge Worker
b82174bc3a docs: Removing most of the intro to PowerManager API am: 3fea8d1042 am: f92878e651 am: c06564375b
Change-Id: I9605f308953aabb49868763dbf5bfd66ac955bee
2019-12-17 20:32:46 +00:00
Automerger Merge Worker
c06564375b docs: Removing most of the intro to PowerManager API am: 3fea8d1042 am: f92878e651
Change-Id: I07ea69318879ad5c70c99880c6cc6c57a348d76a
2019-12-17 20:18:50 +00:00
Automerger Merge Worker
f92878e651 docs: Removing most of the intro to PowerManager API am: 3fea8d1042
Change-Id: I25c41e4998197ef1df2c95fb1f2360360970389f
2019-12-17 19:58:53 +00:00
Automerger Merge Worker
f47a64b59d Merge "[Telephony Mainline] Expose MAX_NETWORK_TYPE constant" am: 23019528ec am: a4c3162339
Change-Id: I263fbd69be70ccf48b0e16d00985e716060f6bfa
2019-12-17 19:20:16 +00:00
Andrew Solovay
3fea8d1042 docs: Removing most of the intro to PowerManager API
The intro text says PowerManager is discouraged, and almost
all the available wakelock options have long been deprecated.
Given that, I think it makes sense to remove most of that
intro and just point devs to FLAG_KEEP_SCREEN_ON instead.

Staged to:
go/dac-stage/reference/android/os/PowerManager

Test: make ds-docs
Bug: 145699347
Change-Id: I517366903f3d9743166d7edaddc08471af0803d9
2019-12-16 22:05:12 +00:00
Peter Wang
2dae34155e [Telephony Mainline] Expose MAX_NETWORK_TYPE constant
Test: Build
Bug: 140908357
Change-Id: I40cbcdfb8e77b3e01968d008f4359790c4264539
Merged-In: I40cbcdfb8e77b3e01968d008f4359790c4264539
2019-12-13 15:36:17 -08:00
Automerger Merge Worker
b988967879 Merge "Pipe disabled compat changes to runtime through zygote." am: f33c3a8c9d am: c06f69d2b4
Change-Id: I189518f7abee2013a57c8b76c69e02145ef4238a
2019-12-12 14:22:35 +00:00
atrost
e44e134776 Pipe disabled compat changes to runtime through zygote.
Test: Java in process API still work correctly - tested locally with test app + adb overrides.
Test: atest com.android.internal.os
Test: atest com.android.server.am
Bug: 145743810
Change-Id: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
Merged-In: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
2019-12-11 18:44:20 +00:00
Automerger Merge Worker
08135b313a Merge "Do not cache enabled tags in Java." am: e280c89075 am: 2dcd338a46
Change-Id: I631b07420837c5271e2162c98d6f2c5150a8528e
2019-12-10 22:56:23 +00:00
Treehugger Robot
e280c89075 Merge "Do not cache enabled tags in Java." 2019-12-10 22:26:16 +00:00
Florian Mayer
dd025de034 Do not cache enabled tags in Java.
As we are elimating the Binder notifications for the sysprop update for
atrace, we no longer have a callback that can be used to read the new
value of the enabled tags.

@CritivalNative calls are very fast (25 ns) so the overhead of always
going to native code to read the tags is negligible.

Test: flash & boot
Test: adb shell su root atrace -t 10 ss
Test: adb shell su root atrace -t 10 wm

Bug: 137366208

This is a cherry-pick of 9fd210224a

Change-Id: I1a07fefd751ee28ca9a632a3d78a2925e8827b9c
Merged-In: I1a07fefd751ee28ca9a632a3d78a2925e8827b9c
2019-12-10 13:17:23 +00:00
Songchun Fan
e63063585c Merge "[incremental] parcelable for incfs file descriptors" am: c8b066091e
am: c93841a265

Change-Id: Ie9469f0e7b380ceafb2773d124d5c4d42c942d89
2019-12-05 15:10:17 -08:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Songchun Fan
000b5b5bf6 [incremental] parcelable for incfs file descriptors
This parcelable is used to pass incfs fds from vold to system_server.

Test: builds
Change-Id: I7f0af8798d12815fbae404afabf4a88229a705da
Merged-In: Ifc3a43633356951b239486d66ee80d120bc4ab76
2019-12-04 17:42:57 -08:00
Peter Wang
cead28dcee Merge "[Telephony Mainline] Expose hidden APIs and consts" am: 415143daf5
am: cfffdedc87

Change-Id: I26b52ec69d769591243c65caaec8066f1744d7a7
2019-12-04 15:55:20 -08:00
Peter Wang
415143daf5 Merge "[Telephony Mainline] Expose hidden APIs and consts" 2019-12-04 23:39:50 +00:00
Treehugger Robot
2b65793cd6 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:02 +00:00
Peter Wang
98598bfe16 [Telephony Mainline] Expose hidden APIs and consts
Exposing constants that were originally hidden

Test: build
Bug: 140908357
Change-Id: I12b8d338a58c0ffe294137171b8bac7d80a0b776
Merged-In: I12b8d338a58c0ffe294137171b8bac7d80a0b776
2019-12-03 19:12:47 +00:00
Dario Freni
28710b1290 Support privileged apps installed in APEX. am: 787471af48
am: 3fad35fa15

Change-Id: Idc501a4c77d6d3f13e7b416d98815d9b944c9202
2019-12-03 08:44:41 -08:00
Dario Freni
3fad35fa15 Support privileged apps installed in APEX.
am: 787471af48

Change-Id: I8503952e179d79cf574430040af31611fe90d7ad
2019-12-03 08:33:54 -08:00
Dario Freni
c7a4eec435 Merge changes from topic "aosp-apk-in-apex"
* changes:
  DO NOT MERGE: Fixes NPE when preparing app data during init
  Support privileged apps installed in APEX.
  Support non-privileged APKs in APEX.
  Refactors initial directory scan to be dryer
2019-12-03 11:45:55 +00:00
Nick Cook
3e2651cc8a Merge "docs: Delete duplicate word." into qt-dev am: 54a4bdccc4 am: 9480139340
am: eb179fa342

Change-Id: I835207741811d71e8e5b89405226922f4759c90c
2019-12-02 15:24:38 -08:00
Automerger Merge Worker
eb179fa342 Merge "docs: Delete duplicate word." into qt-dev am: 54a4bdccc4 am: 9480139340
Change-Id: I1027bb9b9a2dd830cbdf99f03369e08a464a3279
2019-12-02 23:13:37 +00:00
Automerger Merge Worker
9480139340 Merge "docs: Delete duplicate word." into qt-dev am: 54a4bdccc4
Change-Id: I8a2aa5bc892412471324f3ec5edfa2aa6d39d62c
2019-12-02 23:03:04 +00:00
Steven Moreland
6090a98164 Merge "Binder: add markVintfStability" am: 4bdfc3c05c
am: c8d045a384

Change-Id: If93712ec83f04f50b7815c2179f08c3f52abeb7f
2019-12-02 08:55:26 -08:00
Steven Moreland
c8d045a384 Merge "Binder: add markVintfStability"
am: 4bdfc3c05c

Change-Id: I232f3db9979d47caaef0d5d75c263c8cfb7119c7
2019-12-02 08:50:57 -08:00
Steven Moreland
4bdfc3c05c Merge "Binder: add markVintfStability" 2019-12-02 16:46:17 +00:00
Mark Chien
d2958bb368 Merge changes from topic "tether_migrate" am: e8401aff92
am: 4bb02709c5

Change-Id: Ice864e02b2ef9da73f5a69e0668b6856e718988f
2019-11-30 04:31:35 -08:00
markchien
146e4976bf [Tether07] Migrate Tethering into module am: 0df2ebc43d
am: 6b828d2915

Change-Id: I6e71b418b7303d37144532ab056c21ccbefcb554
2019-11-30 04:31:28 -08:00
Mark Chien
4bb02709c5 Merge changes from topic "tether_migrate"
am: e8401aff92

Change-Id: I03e43b7a112f91637941e5193bd21b3e714f5dac
2019-11-30 04:26:07 -08:00
markchien
6b828d2915 [Tether07] Migrate Tethering into module
am: 0df2ebc43d

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc
2019-11-30 04:25:57 -08:00
Mark Chien
e8401aff92 Merge changes from topic "tether_migrate"
* changes:
  [Tether10]Remove UserManagerInternal usage in Tethering
  [Tether07] Migrate Tethering into module
  [Tether07] Clean up build rule for libtetheroffloadjni
2019-11-30 12:17:47 +00:00
markchien
b741c646c6 [Tether10]Remove UserManagerInternal usage in Tethering
To be the unbundled application, tethering can not use UserManagerInternal
method anymore. Replace it by listening user restriction change intent.

Also fix some cleanup from
https://android-review.googlesource.com/c/platform/frameworks/base/+/1131002

Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests
      -manual test. Add a trigger point to call
       UserManager.setUserRestriction(DISALLOW_CONFIG_TETHERING) from
       Settings. Open hotspot -> restrict tethering from new adding trigger
       point -> hotspot is OFF and Tethering settings are not available.

Change-Id: I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1
Merged-In: I4ed08d20f8b7476b8ecd5d018b75806dd2f22cc1
2019-11-30 10:06:23 +00:00
markchien
0df2ebc43d [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
Suprabh Shukla
2629f2a5bf Merge "Adding version code R for development" am: b578bdbe43
am: 040206bfcc

Change-Id: I108aed3a11875dd313e43c212526871e06ff9d33
2019-11-29 09:22:30 -08:00
Suprabh Shukla
040206bfcc Merge "Adding version code R for development"
am: b578bdbe43

Change-Id: I704d797eb4c3c0f2ffc449cb32681e68fcf7cc16
2019-11-29 09:18:22 -08:00
Treehugger Robot
b578bdbe43 Merge "Adding version code R for development" 2019-11-29 17:10:43 +00:00
Felix
dce3bc68cd Merge "core/Build: ro.system when comparing fingerprint" am: 82fee58478
am: 1397337346

Change-Id: I3af5fa835de85906b1ab01e92856d93e82afb51c
2019-11-28 18:49:53 -08:00
Felix
1397337346 Merge "core/Build: ro.system when comparing fingerprint"
am: 82fee58478

Change-Id: I527f1ff7c5e9dda76ec36dbe6fb1d041e6a36437
2019-11-28 18:45:32 -08:00
Treehugger Robot
82fee58478 Merge "core/Build: ro.system when comparing fingerprint" 2019-11-29 02:36:48 +00:00
Suprabh Shukla
6a509cf4a5 Adding version code R for development
Test: Builds

Bug: 129975435
Change-Id: I26ef76266b2f52746ca08a45f5013c580cecd4fb
Merged-In: I26ef76266b2f52746ca08a45f5013c580cecd4fb
(cherry picked from commit 1d081c503c)
2019-11-28 14:29:12 +00:00
Dario Freni
7d038cd0e9 Support non-privileged APKs in APEX.
This change adds initial support for scanning APEX directories looking
for APK, and make them available to the system as normal system APKs.
For now privileged apps and resource overlay are not supported, and the
support will be added in a later CL.

Scanning features are inherited from the partition in which the
preinstalled version of a given APEX module is located.

Supports both flattened and un-flattened APEX configurations.

Bug: 138429615
Test: Compiled a test apex with the Snake app installed in it. Verified
app is correctly scanned and usable. Tried also installing the apex in
/vendor and /product.
Exempt-From-Owner-Approval: Approved in
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/9533445
Merged-In: I8fb91317da0296567403b2b62babbb71e4b48938
Change-Id: I8fb91317da0296567403b2b62babbb71e4b48938
2019-11-28 18:28:00 +08:00
Steven Moreland
d587a555de Binder: add markVintfStability
For the AIDL compiler to call. Without this, the Java framework can't
pass callbacks to HALs.

Bug: 139325468
Test: use vibrator callback from Java
Change-Id: I147d3e3da699ce740f6589264b37f43f8557719b
2019-11-27 18:15:33 -08:00
Nick Cook
4ca501a6bf docs: Delete duplicate word.
Change-Id: I09fcceda7a7b0fd291c57a3005d4e027ecb99bcc
bug: 145259639
2019-11-27 22:03:43 +00:00
Neil Fuller
18e458ef00 Merge "Remove dead code from SystemServer" am: 05eeef4188
am: 01d1dd28f1

Change-Id: Ifa10a6e2b48f596bfa6854e1a950cec060253c76
2019-11-25 06:28:07 -08:00
Neil Fuller
01d1dd28f1 Merge "Remove dead code from SystemServer"
am: 05eeef4188

Change-Id: I910fb0ac35c8de8fd500b3df0253c65b6b201fb4
2019-11-25 06:12:57 -08:00
Neil Fuller
05eeef4188 Merge "Remove dead code from SystemServer" 2019-11-25 13:53:15 +00:00
Charles Munger
17fac19d82 Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475
am: 769cf05c56

Change-Id: I1acede5beae3963825155e83eaa4381ea27c83c6
2019-11-22 16:08:57 -08:00
Charles Munger
769cf05c56 Merge "Deprecate FileUtils.closeQuietly"
am: e4b84f3475

Change-Id: Ia2f71d7cd97b32a175d0210a8f567ae75030439e
2019-11-22 16:03:14 -08:00
Treehugger Robot
e4b84f3475 Merge "Deprecate FileUtils.closeQuietly" 2019-11-22 23:52:41 +00:00