OSDN Git Service

android-x86/frameworks-base.git
5 years agoDisable XOM on libraries for apps with targetSdkVerison<Q
Jeff Vander Stoep [Tue, 26 Mar 2019 03:27:52 +0000 (20:27 -0700)]
Disable XOM on libraries for apps with targetSdkVerison<Q

Apps may (and do) assume that libraries are readable. To avoid app
breakage, mark execute-only sections of as read+execute
for apps with targetSdkVersion<Q.

Bug: 128907672
Test: Check libc for app with targetSdk==current
cat /proc/25950/maps | grep libc.so
77c01e3000-77c028b000 --xp 00041000 07:20 106 /apex/com.android.runtime/lib64/bionic/libc.so
Test: Check libc for app with targetSdk<current
cat /proc/26355/maps | grep libc.so
77c01e3000-77c028b000 r-xp 00041000 07:20 106
/apex/com.android.runtime/lib64/bionic/libc.so

Change-Id: I90b5c91923c8008ae4b4818985842fe3e354a850

5 years agoMerge "Remove interface for Rollback and Rollback Boot."
Matt Pape [Tue, 19 Mar 2019 16:14:05 +0000 (16:14 +0000)]
Merge "Remove interface for Rollback and Rollback Boot."

5 years agoMerge "Move some no longer flaky tests to pre-submit"
TreeHugger Robot [Tue, 19 Mar 2019 16:04:35 +0000 (16:04 +0000)]
Merge "Move some no longer flaky tests to pre-submit"

5 years agoMerge "Add app_compat namespace"
Andrei-Valentin Onea [Tue, 19 Mar 2019 16:01:17 +0000 (16:01 +0000)]
Merge "Add app_compat namespace"

5 years agoRemove the framework dependency on netd_aidl_parcelables-java.
Lorenzo Colitti [Tue, 19 Mar 2019 01:56:37 +0000 (10:56 +0900)]
Remove the framework dependency on netd_aidl_parcelables-java.

In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db

5 years agoMove TcpKeepalivePacketData out of the framework.
Lorenzo Colitti [Mon, 18 Mar 2019 15:24:19 +0000 (00:24 +0900)]
Move TcpKeepalivePacketData out of the framework.

This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.

This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.

Test: m
Bug: 128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703

5 years agoStop using netd parcelables in the framework.
Lorenzo Colitti [Mon, 18 Mar 2019 14:50:34 +0000 (23:50 +0900)]
Stop using netd parcelables in the framework.

The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a

5 years agoMerge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93...
Tyler Gunn [Tue, 19 Mar 2019 15:44:53 +0000 (08:44 -0700)]
Merge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93 am: 572f0ca7e4
am: 1abcf7d70e

Change-Id: I9b738c3efea61704b4d892219cf175466676859e

5 years agoMerge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93
Tyler Gunn [Tue, 19 Mar 2019 15:35:13 +0000 (08:35 -0700)]
Merge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93
am: 572f0ca7e4

Change-Id: Ib95672647d84f74f2fe24b8adac7a5ac30554c0c

5 years agoMerge "New intent action for speakerphone state change"
TreeHugger Robot [Tue, 19 Mar 2019 15:34:07 +0000 (15:34 +0000)]
Merge "New intent action for speakerphone state change"

5 years agoMerge "Extend light-greylist of some TelephonyManager APIs until Q."
Tyler Gunn [Tue, 19 Mar 2019 15:26:43 +0000 (08:26 -0700)]
Merge "Extend light-greylist of some TelephonyManager APIs until Q."
am: 0bb3c6bb93

Change-Id: I98739ce5d5210437df0618d14a6923ce92bccf03

5 years agoMerge "Extend light-greylist of some TelephonyManager APIs until Q."
Tyler Gunn [Tue, 19 Mar 2019 15:17:16 +0000 (15:17 +0000)]
Merge "Extend light-greylist of some TelephonyManager APIs until Q."

5 years agoMerge "Revert "Rename some failed causes"" am: e3cc2e6c98 am: 90e2f900ca
Paul Hu [Tue, 19 Mar 2019 15:05:53 +0000 (08:05 -0700)]
Merge "Revert "Rename some failed causes"" am: e3cc2e6c98 am: 90e2f900ca
am: 778f372e23

Change-Id: I82c8bfb9a5f08d7ca205b2f18282f5346709b2e0

5 years agoMerge "Revert "Rename some failed causes"" am: e3cc2e6c98
Paul Hu [Tue, 19 Mar 2019 14:55:22 +0000 (07:55 -0700)]
Merge "Revert "Rename some failed causes"" am: e3cc2e6c98
am: 90e2f900ca

Change-Id: I1b951e3b00983a364b4eef8edb6e5c1d032a3b43

5 years agoMerge "Revert "Rename some failed causes""
Paul Hu [Tue, 19 Mar 2019 14:46:17 +0000 (07:46 -0700)]
Merge "Revert "Rename some failed causes""
am: e3cc2e6c98

Change-Id: I29efdbba830f08ca1a0c01058fce719c8b501dbe

5 years agoMerge "Mark product apks as unbundled" am: 856ef55672 am: 716111d81c
Kiyoung Kim [Tue, 19 Mar 2019 14:44:54 +0000 (07:44 -0700)]
Merge "Mark product apks as unbundled" am: 856ef55672 am: 716111d81c
am: e1e02641af

Change-Id: I2b8497140c4ba063a09617ee866c89459fe8918a

5 years agoMerge "Add start/end padding for entity header"
TreeHugger Robot [Tue, 19 Mar 2019 14:35:45 +0000 (14:35 +0000)]
Merge "Add start/end padding for entity header"

5 years agoMerge "Revert "Rename some failed causes""
Treehugger Robot [Tue, 19 Mar 2019 14:31:34 +0000 (14:31 +0000)]
Merge "Revert "Rename some failed causes""

5 years agoMerge "Mark product apks as unbundled" am: 856ef55672
Kiyoung Kim [Tue, 19 Mar 2019 14:30:57 +0000 (07:30 -0700)]
Merge "Mark product apks as unbundled" am: 856ef55672
am: 716111d81c

Change-Id: I242bbc9c151a4a8751d852fed34ec021675aad1b

5 years agoMerge changes I7bf9bde4,I8d655d1c,Ibc59aa36
TreeHugger Robot [Tue, 19 Mar 2019 14:22:28 +0000 (14:22 +0000)]
Merge changes I7bf9bde4,I8d655d1c,Ibc59aa36

* changes:
  Adds class and method documentation in all app prediction classes
  Link Intent.EXTRA_SHORTCUT_ID to ACTION_SEND Intent
  Change ShortcutInfo.Builder.setLongLived to take a boolean

5 years agoMerge "Mark product apks as unbundled"
Kiyoung Kim [Tue, 19 Mar 2019 14:17:53 +0000 (07:17 -0700)]
Merge "Mark product apks as unbundled"
am: 856ef55672

Change-Id: I9d4d7cf2ae8e47c8aaed82d0d47861cd7d787067

5 years agoMove some no longer flaky tests to pre-submit
Wale Ogunwale [Tue, 19 Mar 2019 14:08:29 +0000 (07:08 -0700)]
Move some no longer flaky tests to pre-submit

Bug: 124127512
Bug: 123654474
Test: self
Change-Id: I3fa53f0268d225d8e44b652a8bbf877531154244

5 years agoMerge "Mark product apks as unbundled"
Treehugger Robot [Tue, 19 Mar 2019 14:02:59 +0000 (14:02 +0000)]
Merge "Mark product apks as unbundled"

5 years agoMerge "Yet another app that is confused by sandboxes."
Jeff Sharkey [Tue, 19 Mar 2019 13:57:21 +0000 (13:57 +0000)]
Merge "Yet another app that is confused by sandboxes."

5 years agoMerge "Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db151...
Android Build Merger (Role) [Tue, 19 Mar 2019 13:56:08 +0000 (13:56 +0000)]
Merge "Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa am: 3176d57308"

5 years agoMerge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa
Xiao Ma [Tue, 19 Mar 2019 13:54:43 +0000 (06:54 -0700)]
Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa
am: 3176d57308

Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe

5 years agoMerge "Sharesheet - Profile switching & permissions"
TreeHugger Robot [Tue, 19 Mar 2019 13:52:05 +0000 (13:52 +0000)]
Merge "Sharesheet - Profile switching & permissions"

5 years agoMerge "Move the IpMemoryStore to the network stack." am: 93bf5ef495
Xiao Ma [Tue, 19 Mar 2019 13:44:45 +0000 (06:44 -0700)]
Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495
am: 5db1518bfa

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d

5 years agoMerge "Fixes the problem of uninstalled app does not disappear from the list of Setti...
Console Chen [Tue, 19 Mar 2019 13:38:49 +0000 (13:38 +0000)]
Merge "Fixes the problem of uninstalled app does not disappear from the list of Settings App info."

5 years agoMerge "Move the IpMemoryStore to the network stack."
Xiao Ma [Tue, 19 Mar 2019 13:35:31 +0000 (06:35 -0700)]
Merge "Move the IpMemoryStore to the network stack."
am: 93bf5ef495

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570

5 years agoMerge "Move the IpMemoryStore to the network stack."
Xiao Ma [Tue, 19 Mar 2019 13:21:12 +0000 (13:21 +0000)]
Merge "Move the IpMemoryStore to the network stack."

5 years agoAdd app_compat namespace
Andrei Onea [Wed, 13 Mar 2019 11:59:53 +0000 (11:59 +0000)]
Add app_compat namespace

Test: m
Bug: 119217680
Change-Id: I8bcc9013c80f7e4cb2df36676427671c05ce0952

5 years agoMerge "Change the pulled atom SDCardInfo to ExternalStorageInfo so that we log inform...
Carmen Agimof [Tue, 19 Mar 2019 13:15:39 +0000 (13:15 +0000)]
Merge "Change the pulled atom SDCardInfo to ExternalStorageInfo so that we log information about all types of external storage (e.g. USBs)."

5 years agoAdd start/end padding for entity header
tmfang [Tue, 19 Mar 2019 12:52:48 +0000 (20:52 +0800)]
Add start/end padding for entity header

Fixes: 124677177
Test: visual
Change-Id: I7074778b6e0b4e6270612f89685024425a719990

5 years agoMerge "Add trace points for GraphicsEnvironment setup"
TreeHugger Robot [Tue, 19 Mar 2019 12:16:19 +0000 (12:16 +0000)]
Merge "Add trace points for GraphicsEnvironment setup"

5 years agoSharesheet - Profile switching & permissions
Matt Pietal [Fri, 15 Mar 2019 12:46:20 +0000 (08:46 -0400)]
Sharesheet - Profile switching & permissions

Need to make sure all content uris have the userid prepended in them,
otherwise when switching profiles the chooser will be denied access.
This is needed for content preview in the chooser itself.

Bug: 128597855
Test: atest ChooserActivityTest
Change-Id: Id835c7b443c1c5a83a8bf61d0545d86e32e92bfc

5 years agoMerge "Fix color sampling API per review comments."
TreeHugger Robot [Tue, 19 Mar 2019 11:12:45 +0000 (11:12 +0000)]
Merge "Fix color sampling API per review comments."

5 years agoMerge "WebView: add all APKs to asset path."
TreeHugger Robot [Tue, 19 Mar 2019 11:04:24 +0000 (11:04 +0000)]
Merge "WebView: add all APKs to asset path."

5 years agoMerge "API Review: clearUserDataOnFailedRestore manifest flag"
Ruslan Tkhakokhov [Tue, 19 Mar 2019 09:44:43 +0000 (09:44 +0000)]
Merge "API Review: clearUserDataOnFailedRestore manifest flag"

5 years agoMerge "Use SystemUi's privapp for CarSystemUi."
TreeHugger Robot [Tue, 19 Mar 2019 09:35:35 +0000 (09:35 +0000)]
Merge "Use SystemUi's privapp for CarSystemUi."

5 years agoMerge "Fix API for SocketUtils" am: 4a66729cfe am: 55d7bc0106
Remi NGUYEN VAN [Tue, 19 Mar 2019 08:39:37 +0000 (01:39 -0700)]
Merge "Fix API for SocketUtils" am: 4a66729cfe am: 55d7bc0106
am: e35cba5262

Change-Id: I91b741adfade7a8d3271ffa8792e290ad07a2f00

5 years agoMerge "Fix API for SocketUtils" am: 4a66729cfe
Remi NGUYEN VAN [Tue, 19 Mar 2019 08:30:11 +0000 (01:30 -0700)]
Merge "Fix API for SocketUtils" am: 4a66729cfe
am: 55d7bc0106

Change-Id: I81f59494241c5806c7c58422b6ab7d0be2cdd3a4

5 years agoMerge "Fix API for SocketUtils"
Remi NGUYEN VAN [Tue, 19 Mar 2019 08:21:20 +0000 (01:21 -0700)]
Merge "Fix API for SocketUtils"
am: 4a66729cfe

Change-Id: I2340b528ab7a1a628e257205603d0d902f7cccd0

5 years agoMerge "Fix API for SocketUtils"
Remi NGUYEN VAN [Tue, 19 Mar 2019 08:08:50 +0000 (08:08 +0000)]
Merge "Fix API for SocketUtils"

5 years agoMerge "Add tests for multi-display in System UI"
Charles Chen [Tue, 19 Mar 2019 07:20:56 +0000 (07:20 +0000)]
Merge "Add tests for multi-display in System UI"

5 years agoMerge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc am: 7d249575a1
Luke Huang [Tue, 19 Mar 2019 06:40:49 +0000 (23:40 -0700)]
Merge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc am: 7d249575a1
am: e640b70ee8

Change-Id: Ia2305094fe66017fbdfdc18b2c7284452ac90036

5 years agoMerge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc
Luke Huang [Tue, 19 Mar 2019 06:25:58 +0000 (23:25 -0700)]
Merge "Replace Handler with Executor for async DNS API" am: 2656b3d4cc
am: 7d249575a1

Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146

5 years agoMerge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642 am:...
Luke Huang [Tue, 19 Mar 2019 06:24:06 +0000 (23:24 -0700)]
Merge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642 am: 9a4c839725
am: 6e2648a7bc

Change-Id: Id4d0ae87b1ac8618c28da666619c5c5b5bd2d722

5 years agoMerge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642
Luke Huang [Tue, 19 Mar 2019 06:09:58 +0000 (23:09 -0700)]
Merge "Refactor answer callback for async DNS query JAVA API" am: f1d0fd2642
am: 9a4c839725

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a

5 years agoMerge "Replace Handler with Executor for async DNS API"
Luke Huang [Tue, 19 Mar 2019 06:05:15 +0000 (23:05 -0700)]
Merge "Replace Handler with Executor for async DNS API"
am: 2656b3d4cc

Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745

5 years agoMerge "Add padlock to the top of the bouncer"
Lucas Dupin [Tue, 19 Mar 2019 06:02:37 +0000 (06:02 +0000)]
Merge "Add padlock to the top of the bouncer"

5 years agoMerge "Refactor answer callback for async DNS query JAVA API"
Luke Huang [Tue, 19 Mar 2019 05:55:37 +0000 (22:55 -0700)]
Merge "Refactor answer callback for async DNS query JAVA API"
am: f1d0fd2642

Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f

5 years agoMerge "Replace Handler with Executor for async DNS API"
Luke Huang [Tue, 19 Mar 2019 05:35:39 +0000 (05:35 +0000)]
Merge "Replace Handler with Executor for async DNS API"

5 years agoMerge "Refactor answer callback for async DNS query JAVA API"
Luke Huang [Tue, 19 Mar 2019 05:35:18 +0000 (05:35 +0000)]
Merge "Refactor answer callback for async DNS query JAVA API"

5 years agoAdd trace points for GraphicsEnvironment setup
Yiwei Zhang [Tue, 19 Mar 2019 05:16:42 +0000 (22:16 -0700)]
Add trace points for GraphicsEnvironment setup

Bug: 126775624
Test: build, flash and boot. Take systrace to verify.
Change-Id: I190f84878fb714acb2cf25dfc5d8b546b3bbd67a

5 years agoMerge "Formalizing states in BatterySaverStateMachine."
TreeHugger Robot [Tue, 19 Mar 2019 04:59:23 +0000 (04:59 +0000)]
Merge "Formalizing states in BatterySaverStateMachine."

5 years agoMerge "Remove SessionLink"
Hyundo Moon [Tue, 19 Mar 2019 04:53:56 +0000 (04:53 +0000)]
Merge "Remove SessionLink"

5 years agoMerge "Use the same logic to launch home activity"
TreeHugger Robot [Tue, 19 Mar 2019 04:04:49 +0000 (04:04 +0000)]
Merge "Use the same logic to launch home activity"

5 years agoMerge "Delete pAsset* when failing to open chunk from FileAsset"
TreeHugger Robot [Tue, 19 Mar 2019 03:54:49 +0000 (03:54 +0000)]
Merge "Delete pAsset* when failing to open chunk from FileAsset"

5 years agoMerge "Reorder GlobalActionsDialog.ActionDialog init logic"
TreeHugger Robot [Tue, 19 Mar 2019 03:49:19 +0000 (03:49 +0000)]
Merge "Reorder GlobalActionsDialog.ActionDialog init logic"

5 years agoMerge "Fixing engineGetCertificateChain exception" am: 09e3d8c3eb am: 53187655d0
Max Bires [Tue, 19 Mar 2019 03:45:55 +0000 (20:45 -0700)]
Merge "Fixing engineGetCertificateChain exception" am: 09e3d8c3eb am: 53187655d0
am: efb8468705

Change-Id: I8157345ed59352152c5035467f94836c0c4f216e

5 years agoMerge "Document type of euicc privileged action extras."
TreeHugger Robot [Tue, 19 Mar 2019 03:40:52 +0000 (03:40 +0000)]
Merge "Document type of euicc privileged action extras."

5 years agoMerge "Remove deprecated entitlement API" am: 36459170a7 am: 6f86953a39
Mark Chien [Tue, 19 Mar 2019 03:38:36 +0000 (20:38 -0700)]
Merge "Remove deprecated entitlement API" am: 36459170a7 am: 6f86953a39
am: d9fbd454de

Change-Id: I6bb5611de8d45e9a5c17128ea38ba1bdd8f86ac2

5 years agoMerge "add two more parameters to carrier id TestAPI"
Chen Xu [Tue, 19 Mar 2019 03:32:03 +0000 (03:32 +0000)]
Merge "add two more parameters to carrier id TestAPI"

5 years agoMerge "Fixing engineGetCertificateChain exception" am: 09e3d8c3eb
Max Bires [Tue, 19 Mar 2019 03:27:50 +0000 (20:27 -0700)]
Merge "Fixing engineGetCertificateChain exception" am: 09e3d8c3eb
am: 53187655d0

Change-Id: I32f5a32c751647ac9843015bdea9917c9962dffd

5 years agoMerge "Merge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17...
Android Build Merger (Role) [Tue, 19 Mar 2019 03:24:38 +0000 (03:24 +0000)]
Merge "Merge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17e277 am: ea7b1b7bb9"

5 years agoMerge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17e277
Lorenzo Colitti [Tue, 19 Mar 2019 03:23:30 +0000 (20:23 -0700)]
Merge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17e277
am: ea7b1b7bb9

Change-Id: I0cc600177432f11c7d7dab39478336ed9b7409d7

5 years agoMerge "Remove deprecated entitlement API" am: 36459170a7
Mark Chien [Tue, 19 Mar 2019 03:22:09 +0000 (20:22 -0700)]
Merge "Remove deprecated entitlement API" am: 36459170a7
am: 6f86953a39

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3

5 years agoMerge "Add AttentionSerivce into dumpsys"
TreeHugger Robot [Tue, 19 Mar 2019 03:19:32 +0000 (03:19 +0000)]
Merge "Add AttentionSerivce into dumpsys"

5 years agoMerge "Fixing engineGetCertificateChain exception"
Max Bires [Tue, 19 Mar 2019 03:15:39 +0000 (20:15 -0700)]
Merge "Fixing engineGetCertificateChain exception"
am: 09e3d8c3eb

Change-Id: I89f4c025671e8ae2092ff45e1bac47d676feeb7d

5 years agoMerge "Renamed the variable"
TreeHugger Robot [Tue, 19 Mar 2019 03:13:23 +0000 (03:13 +0000)]
Merge "Renamed the variable"

5 years agoRevert "Rename some failed causes"
Paul Hu [Tue, 19 Mar 2019 03:11:31 +0000 (03:11 +0000)]
Revert "Rename some failed causes"

This reverts commit 1c405b73b096c5d20c610fb97012f7576bc0cf4e.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I4af7c87d8a8a988c2f1c3dc6662027c6fcd34088

5 years agoMerge "Address API review comments for VPN changes." am: bbfee2b427
Lorenzo Colitti [Tue, 19 Mar 2019 03:08:29 +0000 (20:08 -0700)]
Merge "Address API review comments for VPN changes." am: bbfee2b427
am: 071c17e277

Change-Id: I0c76f4ac181a49f57486b16de2f98f27c60b2a44

5 years agoMerge "Fixing engineGetCertificateChain exception"
Treehugger Robot [Tue, 19 Mar 2019 03:02:31 +0000 (03:02 +0000)]
Merge "Fixing engineGetCertificateChain exception"

5 years agoMerge "Remove deprecated entitlement API"
Mark Chien [Tue, 19 Mar 2019 03:00:35 +0000 (20:00 -0700)]
Merge "Remove deprecated entitlement API"
am: 36459170a7

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c

5 years agoMerge "Update acquisition strings"
TreeHugger Robot [Tue, 19 Mar 2019 02:50:43 +0000 (02:50 +0000)]
Merge "Update acquisition strings"

5 years agoMerge "Remove deprecated entitlement API"
Mark Chien [Tue, 19 Mar 2019 02:44:37 +0000 (02:44 +0000)]
Merge "Remove deprecated entitlement API"

5 years agoMerge "Address API review comments for VPN changes."
Lorenzo Colitti [Tue, 19 Mar 2019 02:34:28 +0000 (19:34 -0700)]
Merge "Address API review comments for VPN changes."
am: bbfee2b427

Change-Id: I79d035244faeef373751e256f49075d1f2a10faf

5 years agoMerge "Remove unpaired AccessibilityEvent"
Jackal Guo [Tue, 19 Mar 2019 02:27:53 +0000 (02:27 +0000)]
Merge "Remove unpaired AccessibilityEvent"

5 years agoMerge "Address API review comments for VPN changes."
Lorenzo Colitti [Tue, 19 Mar 2019 02:16:58 +0000 (02:16 +0000)]
Merge "Address API review comments for VPN changes."

5 years agoMerge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff0...
Dichen Zhang [Tue, 19 Mar 2019 02:09:29 +0000 (19:09 -0700)]
Merge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff07 am: 6be164a330
am: 33435110a2

Change-Id: I8042e41f795a49ce421cb59229b1974bf0afc19a

5 years agoYet another app that is confused by sandboxes.
Jeff Sharkey [Tue, 19 Mar 2019 02:07:47 +0000 (20:07 -0600)]
Yet another app that is confused by sandboxes.

Bug: 124766614
Test: manual
Change-Id: I68fc1b4036a75791c72de322b6aa05575e0d85b7

5 years agoMerge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff07
Dichen Zhang [Tue, 19 Mar 2019 01:56:41 +0000 (18:56 -0700)]
Merge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff07
am: 6be164a330

Change-Id: Ic78d25d9889999186b236f5b6ab978ae5a95e3e6

5 years agoMerge "MediaHTTPConnection: move connection states into an inner class"
Dichen Zhang [Tue, 19 Mar 2019 01:48:41 +0000 (18:48 -0700)]
Merge "MediaHTTPConnection: move connection states into an inner class"
am: abe16aff07

Change-Id: I3b501494ebdd882df2e0073b2e5eb752742a35b1

5 years agoFormalizing states in BatterySaverStateMachine.
Kweku Adams [Thu, 7 Mar 2019 23:38:21 +0000 (15:38 -0800)]
Formalizing states in BatterySaverStateMachine.

Formalizing the states and transitions makes it easier to add new
functionality and guarantee correctness.

This also fixes the issue where automatically turning off sticky
accidentally turns off battery saver since the transition is only
done when in the correct state. The problem was that when the battery
level changed (above the sticky auto disable threshold),
doAutoBatterySaver would be called. stickyEnabled would be true,
and the level would be above the threshold, so it would disable sticky.
Then at the next level drop, doAutoBatterySaver would be called again,
but this time, sticky would be false, so it would go to automatic check
and see that the level is above the threshold and then turn off battery saver.

Bug: 127659938
Bug: 119764865
Bug: 112232746
Bug: 79580230
Test: atest com.android.server.power.batterysaver.BatterySaverStateMachineTest
Test: atest CtsBatterySavingTestCases
Change-Id: Ia311d8bdc593a1680eda82d4d06fee21ea45c0ba

5 years agoMerge "MediaHTTPConnection: move connection states into an inner class"
Treehugger Robot [Tue, 19 Mar 2019 01:29:24 +0000 (01:29 +0000)]
Merge "MediaHTTPConnection: move connection states into an inner class"

5 years agoMerge "Re-parent IME back to display when magnifying"
Jackal Guo [Tue, 19 Mar 2019 01:10:59 +0000 (01:10 +0000)]
Merge "Re-parent IME back to display when magnifying"

5 years agoMerge "Update BiometricPrompt documentation"
Kevin Chyn [Tue, 19 Mar 2019 00:53:31 +0000 (00:53 +0000)]
Merge "Update BiometricPrompt documentation"

5 years agoMerge "Fix BiometricService threading/handling"
Kevin Chyn [Tue, 19 Mar 2019 00:53:17 +0000 (00:53 +0000)]
Merge "Fix BiometricService threading/handling"

5 years agoMerge "[automerger skipped] Merge "Emergency API review" am: 853983ef32 am: c6d673901...
Android Build Merger (Role) [Tue, 19 Mar 2019 00:53:01 +0000 (00:53 +0000)]
Merge "[automerger skipped] Merge "Emergency API review" am: 853983ef32 am: c6d673901a am: 4e7abb98d1 -s ours am skip reason: change_id I6eb1d8a3ae1625ff3f43f983c488c2969649713b with SHA1 613c3d5826 is in history"

5 years agoMerge "Fix BiometricPrompt for smaller screens"
Kevin Chyn [Tue, 19 Mar 2019 00:52:54 +0000 (00:52 +0000)]
Merge "Fix BiometricPrompt for smaller screens"

5 years agoMerge "Remember to start pending client if enumerate takes too long"
Kevin Chyn [Tue, 19 Mar 2019 00:52:33 +0000 (00:52 +0000)]
Merge "Remember to start pending client if enumerate takes too long"

5 years ago[automerger skipped] Merge "Emergency API review" am: 853983ef32 am: c6d673901a
Brad Ebinger [Tue, 19 Mar 2019 00:51:45 +0000 (17:51 -0700)]
[automerger skipped] Merge "Emergency API review" am: 853983ef32 am: c6d673901a
am: 4e7abb98d1 -s ours
am skip reason: change_id I6eb1d8a3ae1625ff3f43f983c488c2969649713b with SHA1 613c3d5826 is in history

Change-Id: Ib082e236265676adebac2649460acd6923eaa2d9

5 years agoAdd padlock to the top of the bouncer
Lucas Dupin [Tue, 12 Mar 2019 04:04:31 +0000 (21:04 -0700)]
Add padlock to the top of the bouncer

Fixes: 111414690
Fixes: 128034554
Test: swipe up from keyguard
Test: tap on notification panel background
Test: double tap on notification
Test: atest StatusBarKeyguardViewManagerTest
Change-Id: If9c0e78c018640377a9a5a1270499e6bf0cdd2cf

5 years agoMerge "Ensure new dialogs do not cause orphaned windows"
TreeHugger Robot [Tue, 19 Mar 2019 00:43:50 +0000 (00:43 +0000)]
Merge "Ensure new dialogs do not cause orphaned windows"

5 years agoUpdate acquisition strings
Kevin Chyn [Mon, 18 Mar 2019 23:59:56 +0000 (16:59 -0700)]
Update acquisition strings

Fixes: 128629012
Fixes: 128452700
Bug: 111548033

Test: Builds
Change-Id: If5ea688cbd6603d05c9f6883e8038ce3a7bc6a6c

5 years agoMerge "Set DEBUG to false for statsd shell subscriber"
Yi Yang [Tue, 19 Mar 2019 00:33:12 +0000 (00:33 +0000)]
Merge "Set DEBUG to false for statsd shell subscriber"

5 years agoMerge "Emergency API review" am: 853983ef32
Brad Ebinger [Tue, 19 Mar 2019 00:29:04 +0000 (17:29 -0700)]
Merge "Emergency API review" am: 853983ef32
am: c6d673901a

Change-Id: I7d869f5e3ef5b98fb52a429687b4a0875baa835d

5 years agoMerge "Revert API removal"
Soonil Nagarkar [Tue, 19 Mar 2019 00:23:03 +0000 (00:23 +0000)]
Merge "Revert API removal"

5 years agoMerge "Tracing for isolated storage changes."
Jeff Sharkey [Tue, 19 Mar 2019 00:23:01 +0000 (00:23 +0000)]
Merge "Tracing for isolated storage changes."