OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Add setScreenUnlockedFunctions method to UsbManager"
Jerry Zhang [Wed, 10 Jan 2018 01:30:03 +0000 (01:30 +0000)]
Merge "Add setScreenUnlockedFunctions method to UsbManager"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 10 Jan 2018 00:58:06 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24...
Android Build Merger (Role) [Wed, 10 Jan 2018 00:38:18 +0000 (00:38 +0000)]
Merge "Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24e5f am: 96a01775ac"

6 years agoMerge "Rename createSHA256Parameters to createSha256Parameters"
TreeHugger Robot [Wed, 10 Jan 2018 00:37:24 +0000 (00:37 +0000)]
Merge "Rename createSHA256Parameters to createSha256Parameters"

6 years agoMerge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24e5f
Jack He [Wed, 10 Jan 2018 00:36:06 +0000 (00:36 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995 am: 8dbfc24e5f
am: 96a01775ac

Change-Id: I3a6d80fcc6c510ceec1b4f1411344cf644093677

6 years agoMerge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995
Jack He [Wed, 10 Jan 2018 00:26:33 +0000 (00:26 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)" am: b1065d6995
am: 8dbfc24e5f

Change-Id: I52fce02e6a0169dff418f4dae89ae54de7fd952d

6 years agoMerge "E2e test: attribution matching and slicing by attribution."
TreeHugger Robot [Wed, 10 Jan 2018 00:22:45 +0000 (00:22 +0000)]
Merge "E2e test: attribution matching and slicing by attribution."

6 years agoMerge "WifiManager: startScan throttling"
TreeHugger Robot [Wed, 10 Jan 2018 00:21:18 +0000 (00:21 +0000)]
Merge "WifiManager: startScan throttling"

6 years agoMerge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b am: 6b943d5deb
Malcolm Chen [Wed, 10 Jan 2018 00:18:56 +0000 (00:18 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b am: 6b943d5deb
am: 904340088a  -s ours

Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40

6 years agoMerge "HFP: Add isInbandRingingEnabled() API (1/4)"
Jack He [Wed, 10 Jan 2018 00:18:15 +0000 (00:18 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
am: b1065d6995

Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1

6 years agoMerge "Fix small but crashy edge case in Icon.scaleDown"
TreeHugger Robot [Wed, 10 Jan 2018 00:09:16 +0000 (00:09 +0000)]
Merge "Fix small but crashy edge case in Icon.scaleDown"

6 years agoMerge "Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised description...
Android Build Merger (Role) [Wed, 10 Jan 2018 00:08:22 +0000 (00:08 +0000)]
Merge "Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359 am: 0630348fa5 am: 14f71757c2  -s ours"

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Wed, 10 Jan 2018 00:07:52 +0000 (00:07 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359 am: 0630348fa5
am: 14f71757c2  -s ours

Change-Id: I1bfff1823386d65c8981e4b9edd99f60571df13c

6 years agoMerge "HFP: Add isInbandRingingEnabled() API (1/4)"
Treehugger Robot [Wed, 10 Jan 2018 00:07:11 +0000 (00:07 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"

6 years agoMerge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b
Malcolm Chen [Wed, 10 Jan 2018 00:06:27 +0000 (00:06 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager." am: ed7eead23b
am: 6b943d5deb

Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083

6 years agoMerge "Track last job run time"
Amith Yamasani [Wed, 10 Jan 2018 00:05:22 +0000 (00:05 +0000)]
Merge "Track last job run time"

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Tue, 9 Jan 2018 23:59:29 +0000 (23:59 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b am: 800e061359
am: 0630348fa5

Change-Id: I0ccaa18cf5a9e84c5f015cf4b97b74a249348c93

6 years agoMerge "Add isMobileDataEnabled in TelephonyManager."
Malcolm Chen [Tue, 9 Jan 2018 23:55:47 +0000 (23:55 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."
am: ed7eead23b

Change-Id: I851529bc4b5507ffa04c07a840aeba6eb3c7f94b

6 years agoMerge "Use String instead of byte[] to represent alias in KeyEntryRecoveryData."
TreeHugger Robot [Tue, 9 Jan 2018 23:54:21 +0000 (23:54 +0000)]
Merge "Use String instead of byte[] to represent alias in KeyEntryRecoveryData."

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Tue, 9 Jan 2018 23:51:10 +0000 (23:51 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b
am: 800e061359

Change-Id: I3854641ab4f80f4bbeae9acd67522fcd8b8484c0

6 years agoMerge "Add isMobileDataEnabled in TelephonyManager."
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Tue, 9 Jan 2018 23:44:04 +0000 (23:44 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
am: d195a9972b

Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae

6 years agoMerge changes from topic "add-android.test.legacy"
TreeHugger Robot [Tue, 9 Jan 2018 23:39:22 +0000 (23:39 +0000)]
Merge changes from topic "add-android.test.legacy"

* changes:
  Add android.test.legacy target
  Modify android.test.runner to use new mock APIs

6 years agoAdd setScreenUnlockedFunctions method to UsbManager
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
Add setScreenUnlockedFunctions method to UsbManager

The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.

Also added svc command for this so it can be
used and tested while the UI is worked on.

Bug: 62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern

Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a

6 years agoMerge "Add connection serivce focus api interface" am: 2f37060ee0 am: ed673edbf0
Pengquan Meng [Tue, 9 Jan 2018 23:22:42 +0000 (23:22 +0000)]
Merge "Add connection serivce focus api interface" am: 2f37060ee0 am: ed673edbf0
am: 40e2b37105  -s ours

Change-Id: Ia896874afcf725ffee4fed0b70028f20d493463a

6 years agoHFP: Add isInbandRingingEnabled() API (1/4)
Jack He [Sat, 6 Jan 2018 01:17:06 +0000 (17:17 -0800)]
HFP: Add isInbandRingingEnabled() API (1/4)

* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
  in-band ringing is currently enabled in the system when deciding on
  audio routes for ringtone
* Add this as a hidden internal API for system components

Bug: 71646213
Test: make, toggle in-band ringing from Development Settings and observe
      whether Telecom service tries to open SCO when there is an
      incoming call

Change-Id: I1ef0dd2b54ace7649ddd1f043f0ef5847743a5c4

6 years agoMerge "incidentd: dumping jobscheduler to proto"
TreeHugger Robot [Tue, 9 Jan 2018 23:15:19 +0000 (23:15 +0000)]
Merge "incidentd: dumping jobscheduler to proto"

6 years agoMerge "Add connection serivce focus api interface" am: 2f37060ee0
Pengquan Meng [Tue, 9 Jan 2018 23:13:15 +0000 (23:13 +0000)]
Merge "Add connection serivce focus api interface" am: 2f37060ee0
am: ed673edbf0

Change-Id: I581b75dcaf63f73150faac9d34e78ccd267eb1cd

6 years agoMerge "Binding on-demand #9: selectBackupTransport[Async]"
Bernardo Rufino [Tue, 9 Jan 2018 23:13:14 +0000 (23:13 +0000)]
Merge "Binding on-demand #9: selectBackupTransport[Async]"

6 years agoMerge "Add connection serivce focus api interface"
Pengquan Meng [Tue, 9 Jan 2018 23:06:10 +0000 (23:06 +0000)]
Merge "Add connection serivce focus api interface"
am: 2f37060ee0

Change-Id: I0797828f9d8edee95b1b8ce8c838c766f5775f97

6 years agoMerge "Remove error log messages when skia shader cache is disabled"
TreeHugger Robot [Tue, 9 Jan 2018 23:05:48 +0000 (23:05 +0000)]
Merge "Remove error log messages when skia shader cache is disabled"

6 years agoMerge "Add connection serivce focus api interface"
Treehugger Robot [Tue, 9 Jan 2018 22:54:42 +0000 (22:54 +0000)]
Merge "Add connection serivce focus api interface"

6 years agoMerge "Disable gesture control to switch apps from nav bar"
TreeHugger Robot [Tue, 9 Jan 2018 22:54:33 +0000 (22:54 +0000)]
Merge "Disable gesture control to switch apps from nav bar"

6 years agoMerge "docs: Revised descriptions of binding and connecting to services."
Kevin Hufnagle [Tue, 9 Jan 2018 22:54:01 +0000 (22:54 +0000)]
Merge "docs: Revised descriptions of binding and connecting to services."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 9 Jan 2018 22:48:29 +0000 (14:48 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id450600fb1da58f8ed6b8085b307d89bf492211b
Auto-generated-cl: translation import

6 years agoMerge "Change style for CheckBoxPreference"
TreeHugger Robot [Tue, 9 Jan 2018 22:42:12 +0000 (22:42 +0000)]
Merge "Change style for CheckBoxPreference"

6 years agoMerge "Add missing usb_device_close() in (native) getDescriptorString()."
TreeHugger Robot [Tue, 9 Jan 2018 22:39:16 +0000 (22:39 +0000)]
Merge "Add missing usb_device_close() in (native) getDescriptorString()."

6 years agoMerge "Lower FSP on window animation too"
TreeHugger Robot [Tue, 9 Jan 2018 22:37:32 +0000 (22:37 +0000)]
Merge "Lower FSP on window animation too"

6 years agoMerge "Drop support for full backup of com.android.providers.settings"
Michal Karpinski [Tue, 9 Jan 2018 22:35:33 +0000 (22:35 +0000)]
Merge "Drop support for full backup of com.android.providers.settings"

6 years agoMerge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0 am: 152b4f28b0
Myles Watson [Tue, 9 Jan 2018 22:34:23 +0000 (22:34 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0 am: 152b4f28b0
am: 96f4e49339

Change-Id: Ie321dd5d94bbc827d88855b634bc6a538d432918

6 years agoRename createSHA256Parameters to createSha256Parameters
Dmitry Dementyev [Tue, 9 Jan 2018 22:28:35 +0000 (14:28 -0800)]
Rename createSHA256Parameters to createSha256Parameters

Fixes the following lint warning:
Warning S1: Method names with acronyms should be getMtu() instead of
getMTU()

Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: If9eb03e2a2a63fe02a2da4828bd0c5c8997078b9

6 years agoMerge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0
Myles Watson [Tue, 9 Jan 2018 22:26:57 +0000 (22:26 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0
am: 152b4f28b0

Change-Id: I765260e8358d6c7f34a72b5f3ef4601579aebf03

6 years agoMerge "Implement front-end APIs for config flags."
Tomasz Wasilczyk [Tue, 9 Jan 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Implement front-end APIs for config flags."

6 years agoMerge "BluetoothProfile: Add Object Push Profile (OPP)"
Myles Watson [Tue, 9 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"
am: 37275780c0

Change-Id: Ie3c40bcfd0f0eee0f8fe1ed8cac680f2c139de0f

6 years agoMerge "BluetoothProfile: Add Object Push Profile (OPP)"
Treehugger Robot [Tue, 9 Jan 2018 22:10:01 +0000 (22:10 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"

6 years agoMerge "Disable airplane mode quick settings when disallow_airplane_mode is set."
TreeHugger Robot [Tue, 9 Jan 2018 22:09:53 +0000 (22:09 +0000)]
Merge "Disable airplane mode quick settings when disallow_airplane_mode is set."

6 years agoMerge "Move zygote's seccomp setup to post-fork" am: 5d33c10a96 am: b629f9e12c
Victor Hsieh [Tue, 9 Jan 2018 22:09:10 +0000 (22:09 +0000)]
Merge "Move zygote's seccomp setup to post-fork" am: 5d33c10a96 am: b629f9e12c
am: dacb02bf5a  -s ours

Change-Id: I3c684dcd5c2776060f32ef48b83774db5fd41d04

6 years agoMerge "Add metric for Smart battery page."
TreeHugger Robot [Tue, 9 Jan 2018 22:03:17 +0000 (22:03 +0000)]
Merge "Add metric for Smart battery page."

6 years agodocs: Adding file to support staging reference docs am: c40eccd9ad
Andrew Solovay [Tue, 9 Jan 2018 21:59:05 +0000 (21:59 +0000)]
docs: Adding file to support staging reference docs am: c40eccd9ad
am: afa73636f7

Change-Id: I3e9bd5ee15e3d820e9cc73782417c7d273f280bb

6 years agoMerge "Move zygote's seccomp setup to post-fork" am: 5d33c10a96
Victor Hsieh [Tue, 9 Jan 2018 21:58:58 +0000 (21:58 +0000)]
Merge "Move zygote's seccomp setup to post-fork" am: 5d33c10a96
am: b629f9e12c

Change-Id: I7d4c6b22c70955a9f594b0e55149a203df56f6fc

6 years agoMerge "Add apis needed for android.test.legacy"
Paul Duffin [Tue, 9 Jan 2018 21:57:14 +0000 (21:57 +0000)]
Merge "Add apis needed for android.test.legacy"

6 years agoMerge "Move zygote's seccomp setup to post-fork"
Victor Hsieh [Tue, 9 Jan 2018 21:51:57 +0000 (21:51 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
am: 5d33c10a96

Change-Id: I1baf09c5b8924e070b473725548faf8a5b48a623

6 years agoMerge "Move zygote's seccomp setup to post-fork"
Treehugger Robot [Tue, 9 Jan 2018 21:41:19 +0000 (21:41 +0000)]
Merge "Move zygote's seccomp setup to post-fork"

6 years agoMerge "Merge "Fix sync initialization on secondary users" am: 99f99a52e7 am: ad4c0c4a...
Android Build Merger (Role) [Tue, 9 Jan 2018 21:39:38 +0000 (21:39 +0000)]
Merge "Merge "Fix sync initialization on secondary users" am: 99f99a52e7 am: ad4c0c4add am: e66f28c6ee"

6 years agoMerge "Fix sync initialization on secondary users" am: 99f99a52e7 am: ad4c0c4add
Makoto Onuki [Tue, 9 Jan 2018 21:39:14 +0000 (21:39 +0000)]
Merge "Fix sync initialization on secondary users" am: 99f99a52e7 am: ad4c0c4add
am: e66f28c6ee

Change-Id: Ic45e3ffddf917fbb02b38aae2623e3cdddb85666

6 years agodocs: Adding file to support staging reference docs
Andrew Solovay [Tue, 9 Jan 2018 21:35:52 +0000 (21:35 +0000)]
docs: Adding file to support staging reference docs
am: c40eccd9ad

Change-Id: I1fd3ee5b710619db76e8c488e1bfaf00950e0b05

6 years agoMerge "Add hidden APIs that return user start/unlock time."
TreeHugger Robot [Tue, 9 Jan 2018 21:35:14 +0000 (21:35 +0000)]
Merge "Add hidden APIs that return user start/unlock time."

6 years agoMerge "Merge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b...
Android Build Merger (Role) [Tue, 9 Jan 2018 21:35:12 +0000 (21:35 +0000)]
Merge "Merge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b am: 0a0a49a022"

6 years agoMerge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b
gaochong [Tue, 9 Jan 2018 21:34:50 +0000 (21:34 +0000)]
Merge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b
am: 0a0a49a022

Change-Id: I8e623f3e8493d1147fcf873fb6491e83b2c2edfe

6 years agoRevert "Restore old stack Z ordering promotion."
Rob Carr [Tue, 9 Jan 2018 17:10:00 +0000 (17:10 +0000)]
Revert "Restore old stack Z ordering promotion."

This reverts commit d92e7eb2e9a72ac73e992cf502a080ad47a962f3.

Reason for revert: Causes 71736995

Change-Id: I8294bdb65a496bfd0170ec606d20d604d5ef6271

6 years agoRevert "Ensure docked divider is below always-on-top stacks."
Rob Carr [Tue, 9 Jan 2018 17:09:51 +0000 (17:09 +0000)]
Revert "Ensure docked divider is below always-on-top stacks."

This reverts commit 11408826496a2c7a8b23e97ec3340972b0df8c36.

Reason for revert: CL earlier in chain causes 71736995

Change-Id: Ifd4bbdb5a3c1fbe95c3e9f6b0172c022d43fcdf6

6 years agoMerge "Revert "Superficial improvements to ZOrderingTest.""
Rob Carr [Tue, 9 Jan 2018 21:30:01 +0000 (21:30 +0000)]
Merge "Revert "Superficial improvements to ZOrderingTest.""

6 years agoMerge "Merge "Remove hashing for PII in Telecom Logging" am: e77808d936 am: 388aca53f...
Android Build Merger (Role) [Tue, 9 Jan 2018 21:29:50 +0000 (21:29 +0000)]
Merge "Merge "Remove hashing for PII in Telecom Logging" am: e77808d936 am: 388aca53f1 am: d8b0a97ce4"

6 years agoMerge "Remove hashing for PII in Telecom Logging" am: e77808d936 am: 388aca53f1
Brad Ebinger [Tue, 9 Jan 2018 21:28:13 +0000 (21:28 +0000)]
Merge "Remove hashing for PII in Telecom Logging" am: e77808d936 am: 388aca53f1
am: d8b0a97ce4

Change-Id: I4867c726c391a346510c5579c7987bb868277f69

6 years agoMerge "Cross profile apps animation part 2"
TreeHugger Robot [Tue, 9 Jan 2018 21:27:23 +0000 (21:27 +0000)]
Merge "Cross profile apps animation part 2"

6 years agoMerge "Fix WTF in shortcuts."
TreeHugger Robot [Tue, 9 Jan 2018 21:26:12 +0000 (21:26 +0000)]
Merge "Fix WTF in shortcuts."

6 years agoMerge "Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am...
Android Build Merger (Role) [Tue, 9 Jan 2018 21:24:06 +0000 (21:24 +0000)]
Merge "Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c am: 764a0b739a"

6 years agoMerge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
Benedict Wong [Tue, 9 Jan 2018 21:23:35 +0000 (21:23 +0000)]
Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
am: 764a0b739a

Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5

6 years agoMerge "Anomaly detection is per dimension"
TreeHugger Robot [Tue, 9 Jan 2018 21:20:23 +0000 (21:20 +0000)]
Merge "Anomaly detection is per dimension"

6 years agoMerge "Add patb to owners" am: a2525e506d am: d14b30205c
Todd Kennedy [Tue, 9 Jan 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add patb to owners" am: a2525e506d am: d14b30205c
am: 536078de96

Change-Id: I6f78e74d559f5720b19fc89fb7c477734d66d9eb

6 years agoMerge "Detect sync handler stuck"
TreeHugger Robot [Tue, 9 Jan 2018 21:13:22 +0000 (21:13 +0000)]
Merge "Detect sync handler stuck"

6 years agoMerge "Fix sync initialization on secondary users" am: 99f99a52e7
Makoto Onuki [Tue, 9 Jan 2018 21:13:15 +0000 (21:13 +0000)]
Merge "Fix sync initialization on secondary users" am: 99f99a52e7
am: ad4c0c4add

Change-Id: I6f991fc7e2186253852cabf55ea95a6a0fbeb6da

6 years agoWifiManager: startScan throttling
Roshan Pius [Thu, 28 Dec 2017 19:37:49 +0000 (11:37 -0800)]
WifiManager: startScan throttling

Changes in the CL:
a) Mark startScan() as deprecated so that we can take away this API in
future releases.
b) Modify the documentation regarding scan throttling to indicate that
both foreground & background apps are subject to throttling.

Bug: 68987915
Test: Compiles
Change-Id: I938237b186c39c6b4cfec9dcdbd9b9d196bae0cc

6 years agoMerge "API cleanup - delete @removed methods"
Oscar Shu [Tue, 9 Jan 2018 21:12:57 +0000 (21:12 +0000)]
Merge "API cleanup - delete @removed methods"

6 years agoMerge changes I9ff5e6fd,I753c0ba0
TreeHugger Robot [Tue, 9 Jan 2018 21:12:02 +0000 (21:12 +0000)]
Merge changes I9ff5e6fd,I753c0ba0

* changes:
  Call prepareSurfaces in applySurfacesChangesTransaction
  Revert "Revert "Avoid setting size/position on Transaction if not needed""

6 years agoMerge "Updates comment for SOFT_AP_TIMEOUT_ENABLED"
Mehdi Alizadeh [Tue, 9 Jan 2018 21:11:18 +0000 (21:11 +0000)]
Merge "Updates comment for SOFT_AP_TIMEOUT_ENABLED"

6 years agoMerge "Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am...
Android Build Merger (Role) [Tue, 9 Jan 2018 21:11:13 +0000 (21:11 +0000)]
Merge "Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am: 4d2ffac581 am: c84d79740e"

6 years agoMerge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am: 4d2ffac581
Malcolm Chen [Tue, 9 Jan 2018 21:10:15 +0000 (21:10 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am: 4d2ffac581
am: c84d79740e

Change-Id: I2998277c63caa244aba07372ac8104aeeed85529

6 years agoMerge "Camera2: Add MOTION_TRACKING capability/intent, and lens poseReference"
Eino-Ville Talvala [Tue, 9 Jan 2018 21:08:00 +0000 (21:08 +0000)]
Merge "Camera2: Add MOTION_TRACKING capability/intent, and lens poseReference"

6 years agoMerge "Fix sync initialization on secondary users"
Makoto Onuki [Tue, 9 Jan 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Fix sync initialization on secondary users"
am: 99f99a52e7

Change-Id: I29f9430a6a3fb8c8a77621f68b0af37b94e3be21

6 years agoMerge "Update on a few DevicePolicyManager APIs for affiliated PO"
TreeHugger Robot [Tue, 9 Jan 2018 21:04:29 +0000 (21:04 +0000)]
Merge "Update on a few DevicePolicyManager APIs for affiliated PO"

6 years agoRemove error log messages when skia shader cache is disabled
Stan Iliev [Tue, 9 Jan 2018 20:59:35 +0000 (15:59 -0500)]
Remove error log messages when skia shader cache is disabled

Ideally processes with a render thread, would turn on shader
caching, but system_server is an exception.

Test: checked logcat for ShaderCache not initialized messages
Bug: 71718344
Change-Id: I5d4df6ae912a6fec3f019c9c831a1177937ea53b

6 years agoMerge "Fix sync initialization on secondary users"
Treehugger Robot [Tue, 9 Jan 2018 20:56:47 +0000 (20:56 +0000)]
Merge "Fix sync initialization on secondary users"

6 years agoAdd missing usb_device_close() in (native) getDescriptorString().
Paul McLean [Tue, 9 Jan 2018 20:55:47 +0000 (12:55 -0800)]
Add missing usb_device_close() in (native) getDescriptorString().

Bug: 71359796
Test: Connect SkyLab and Mir devices and observe correct expected behavior.
Change-Id: I70b5df2f381330b073f6fc7086db493da44b1bb1

6 years agoMerge "Fix ResolverActivity don't show items" am: e251bb72ed
gaochong [Tue, 9 Jan 2018 20:47:22 +0000 (20:47 +0000)]
Merge "Fix ResolverActivity don't show items" am: e251bb72ed
am: 7fd3a8d08b

Change-Id: Ia76b696bcd1ec5763ec3da41fae4c8c2bce9b820

6 years agoMerge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2...
Hans Boehm [Tue, 9 Jan 2018 20:46:35 +0000 (20:46 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2 am: c9e7c10afb
am: f81791c141

Change-Id: Ide59ad63505d92503da64bb70691ff370a548746

6 years agoMerge "Don't wait for NFC when shutting down." am: 5d286326b1 am: a9d1e2a922
Ruchi Kandoi [Tue, 9 Jan 2018 20:42:02 +0000 (20:42 +0000)]
Merge "Don't wait for NFC when shutting down." am: 5d286326b1 am: a9d1e2a922
am: ca37d9f3dd  -s ours

Change-Id: Icb37e9f862a0d08531964e09158ee84265ccd83a

6 years agoLower FSP on window animation too
Makoto Onuki [Tue, 9 Jan 2018 20:35:06 +0000 (12:35 -0800)]
Lower FSP on window animation too

Test: manual test with setprop debug.hwui.fps_divisor 4
Bug: 66945974
Change-Id: I4b637ed30003a9eae008b093f9e3d8b2a2f09319

6 years agoMerge "Fix ResolverActivity don't show items"
gaochong [Tue, 9 Jan 2018 20:39:35 +0000 (20:39 +0000)]
Merge "Fix ResolverActivity don't show items"
am: e251bb72ed

Change-Id: Id4877102db82616c5ad1c6e929721fbddb92b129

6 years agoChange style for CheckBoxPreference
jackqdyulei [Tue, 9 Jan 2018 20:29:21 +0000 (12:29 -0800)]
Change style for CheckBoxPreference

Bug: 71758308
Test: Screenshot
Change-Id: I6aaacc55aa3eeeed01d9eed1ffc97507a885e202

6 years agoMerge "Fix ResolverActivity don't show items"
Treehugger Robot [Tue, 9 Jan 2018 20:30:29 +0000 (20:30 +0000)]
Merge "Fix ResolverActivity don't show items"

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
Kevin Hufnagle [Thu, 29 Jun 2017 22:58:48 +0000 (15:58 -0700)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
docs: Revised descriptions of binding and connecting to services.

Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.

Test: make ds-docs

Bug: 63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e

6 years agoMove zygote's seccomp setup to post-fork
Victor Hsieh [Wed, 20 Dec 2017 17:51:51 +0000 (09:51 -0800)]
Move zygote's seccomp setup to post-fork

Before this change, seccomp filter setup is as early as in zygote's main
function.  To make it possible to split app and system server's filter,
this postpone the setup to after fork.  It also starts to call app
specific and system server specific setup function.

In terms of performance since this happens at fork, the measure shows
the overhead is negligible.  Assuming 130 instruction in the BPF, on
walleye, even when running on little core with fixed low frequency, each
setup took about 60.9us on average.  When it runs on big core with
higher frequency, it took about 39.3us.

Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Bug: 63944145

Change-Id: I748735b478405098beac1e200d911c13ea60e380
Merged-In: I748735b478405098beac1e200d911c13ea60e380

6 years agoincidentd: dumping jobscheduler to proto
Kweku Adams [Mon, 18 Dec 2017 20:04:12 +0000 (12:04 -0800)]
incidentd: dumping jobscheduler to proto

Bug: 65750819
Test: flash device and check incident.proto output
Also test: $ cts-tradefed run cts-dev --module CtsIncidentHostTestCases --test com.android.server.cts.JobSchedulerIncidentTest
Change-Id: I4abc01ca893edcbaf4d2254e4f807e06f5cb91f8

6 years agoUse String instead of byte[] to represent alias in KeyEntryRecoveryData.
Dmitry Dementyev [Tue, 9 Jan 2018 01:31:59 +0000 (17:31 -0800)]
Use String instead of byte[] to represent alias in KeyEntryRecoveryData.

Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Iac74fe856b43faa602ea1c2d9172f669826f4011

6 years agoAdd hidden APIs that return user start/unlock time.
Makoto Onuki [Wed, 20 Dec 2017 04:14:48 +0000 (13:14 +0900)]
Add hidden APIs that return user start/unlock time.

Bug: 69456806
Test: Manual test with "watch dumpsys-user"
Change-Id: I68ed4ef53c707ed7c8cb8be4165052f942ea8ccd

6 years agoMerge "Remove hashing for PII in Telecom Logging" am: e77808d936
Brad Ebinger [Tue, 9 Jan 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Remove hashing for PII in Telecom Logging" am: e77808d936
am: 388aca53f1

Change-Id: I6e6ab2560ef73816dad5eff2b40f632fbdcefe33

6 years agoMerge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
Benedict Wong [Tue, 9 Jan 2018 19:51:19 +0000 (19:51 +0000)]
Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a

6 years agoMerge "Add patb to owners" am: a2525e506d
Todd Kennedy [Tue, 9 Jan 2018 19:47:27 +0000 (19:47 +0000)]
Merge "Add patb to owners" am: a2525e506d
am: d14b30205c

Change-Id: Idc8607b6a377a560a1a713de8153068ab25594ea

6 years agoMerge "Move zygote's seccomp setup to post-fork"
TreeHugger Robot [Tue, 9 Jan 2018 19:43:10 +0000 (19:43 +0000)]
Merge "Move zygote's seccomp setup to post-fork"