OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdd UID and Service for Secure Element Application
Ruchi Kandoi [Thu, 4 Jan 2018 00:14:57 +0000 (16:14 -0800)]
Add UID and Service for Secure Element Application

Bug: 64994044
Test: Boot; Check Service loaded.
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977

6 years agoMerge "Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot."
Dmitry Dementyev [Sat, 27 Jan 2018 00:37:53 +0000 (00:37 +0000)]
Merge "Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot."

6 years agoMerge "Update SmallTest library"
Etan Cohen [Sat, 27 Jan 2018 00:36:50 +0000 (00:36 +0000)]
Merge "Update SmallTest library"

6 years agoMerge "Allow system jobs to be exempted from app-standby"
Makoto Onuki [Sat, 27 Jan 2018 00:31:42 +0000 (00:31 +0000)]
Merge "Allow system jobs to be exempted from app-standby"

6 years agoMerge "Recreate recovery snapshot with current version if it is not stored."
Dmitry Dementyev [Sat, 27 Jan 2018 00:26:47 +0000 (00:26 +0000)]
Merge "Recreate recovery snapshot with current version if it is not stored."

6 years agoMerge "Merge "Support Background Service Limitations." am: a0f863d4fb am: b747134254...
Android Build Merger (Role) [Sat, 27 Jan 2018 00:26:13 +0000 (00:26 +0000)]
Merge "Merge "Support Background Service Limitations." am: a0f863d4fb am: b747134254 am: 7f0e5de1a3"

6 years agoMerge "Remove platform key when user disables lock screen protection"
Dmitry Dementyev [Sat, 27 Jan 2018 00:25:58 +0000 (00:25 +0000)]
Merge "Remove platform key when user disables lock screen protection"

6 years agoMerge "Support Background Service Limitations." am: a0f863d4fb am: b747134254
hirotaka motegi [Sat, 27 Jan 2018 00:25:51 +0000 (00:25 +0000)]
Merge "Support Background Service Limitations." am: a0f863d4fb am: b747134254
am: 7f0e5de1a3

Change-Id: Ie5cc9948a7538a8fedcf645a9d419fb74cc9bc3b

6 years agoMerge "Support Background Service Limitations." am: a0f863d4fb
hirotaka motegi [Sat, 27 Jan 2018 00:13:47 +0000 (00:13 +0000)]
Merge "Support Background Service Limitations." am: a0f863d4fb
am: b747134254

Change-Id: I14259c8d36028440323f940e212c9099a62a6c87

6 years agoMerge "Add support for Multi-A2DP state machines per device" am: bb5318df8a am: adf22...
Pavlin Radoslavov [Sat, 27 Jan 2018 00:11:53 +0000 (00:11 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am: bb5318df8a am: adf2239562
am: bc2e4a230b  -s ours

Change-Id: Iae0f6c59f152c391f319de580d3f9a0ac19be31a

6 years agoMerge "Prevent 2nd action down motionevent on nav bar press"
TreeHugger Robot [Sat, 27 Jan 2018 00:04:27 +0000 (00:04 +0000)]
Merge "Prevent 2nd action down motionevent on nav bar press"

6 years agoMerge "Adding privacy tags for ps dump."
TreeHugger Robot [Sat, 27 Jan 2018 00:01:42 +0000 (00:01 +0000)]
Merge "Adding privacy tags for ps dump."

6 years agoMerge "Add support for Multi-A2DP state machines per device" am: bb5318df8a
Pavlin Radoslavov [Sat, 27 Jan 2018 00:01:20 +0000 (00:01 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am: bb5318df8a
am: adf2239562

Change-Id: Ibe372b2ecda317e7970d6e681a4e2330e69782c1

6 years agoMerge "Add setting/experiment for time only mode for watch type devices."
TreeHugger Robot [Fri, 26 Jan 2018 23:59:25 +0000 (23:59 +0000)]
Merge "Add setting/experiment for time only mode for watch type devices."

6 years agoMerge "Support Background Service Limitations."
hirotaka motegi [Fri, 26 Jan 2018 23:57:58 +0000 (23:57 +0000)]
Merge "Support Background Service Limitations."
am: a0f863d4fb

Change-Id: I9adaa11f83492d5e09d19ded088deb7119bcdade

6 years agoMerge "Add support for Multi-A2DP state machines per device"
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:17 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am: bb5318df8a

Change-Id: I9fabffc6d7fdb3cb001b685618532f10000dd4ac

6 years agoMerge "Remove workaround for the ByteBuffer#put issue"
TreeHugger Robot [Fri, 26 Jan 2018 23:44:42 +0000 (23:44 +0000)]
Merge "Remove workaround for the ByteBuffer#put issue"

6 years agoMerge "Add conscrypt, okhttp, bouncycastle to the classpath when building stubs"
TreeHugger Robot [Fri, 26 Jan 2018 23:44:23 +0000 (23:44 +0000)]
Merge "Add conscrypt, okhttp, bouncycastle to the classpath when building stubs"

6 years agoMerge "Support Background Service Limitations."
Treehugger Robot [Fri, 26 Jan 2018 23:36:21 +0000 (23:36 +0000)]
Merge "Support Background Service Limitations."

6 years agoMerge "Prevent writeDataToDisk calls when switching from guest user to primary user"
Howard Ro [Fri, 26 Jan 2018 23:25:42 +0000 (23:25 +0000)]
Merge "Prevent writeDataToDisk calls when switching from guest user to primary user"

6 years agoMerge "Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e8...
Android Build Merger (Role) [Fri, 26 Jan 2018 23:10:15 +0000 (23:10 +0000)]
Merge "Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8 am: b51d583e32 am: a6d7e270af  -s ours"

6 years agoMerge changes from topic "hidl-system-api"
Steven Moreland [Fri, 26 Jan 2018 23:09:15 +0000 (23:09 +0000)]
Merge changes from topic "hidl-system-api"

* changes:
  Add remaining missing HIDL SystemApi methods.
  HIDL: reportSyspropMethod -> enableInstrumentation

6 years agoMerge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8...
Pavlin Radoslavov [Fri, 26 Jan 2018 23:08:56 +0000 (23:08 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8 am: b51d583e32
am: a6d7e270af  -s ours

Change-Id: I81430ac8e91ede366ca151ced8b9eb1cccaa87be

6 years agoMerge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8
Pavlin Radoslavov [Fri, 26 Jan 2018 23:00:34 +0000 (23:00 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8
am: b51d583e32

Change-Id: I80fe36452b078b25f52eef6f22acdb20e06c10f5

6 years agoMerge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:02 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am: 3151e86aa8

Change-Id: I1f1e62dde014fe4b0a2d3e93aeea0f305232bc01

6 years agoUpdate SmallTest library
Etan Cohen [Tue, 23 Jan 2018 15:10:01 +0000 (07:10 -0800)]
Update SmallTest library

android.test.suitebuilder.annotation.SmallTest is deprecated and
replaced by android.support.test.filters.SmallTest.

Update all test files. No other change.

Bug: 72324160
Test: all unit tests pass
Change-Id: I02ec8419a3eac698077d46b0b95f1f695b0f1b9b

6 years agoMerge "Add support for Multi-A2DP state machines per device"
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"

6 years agoMerge changes Iac1c21ce,I2329432a
TreeHugger Robot [Fri, 26 Jan 2018 22:35:07 +0000 (22:35 +0000)]
Merge changes Iac1c21ce,I2329432a

* changes:
  Add relevant SysUI values to notch emulation packages
  Move QS height values to frameworks/base/core/res/

6 years agoMerge "Merge "Added slot id in the internal API" am: 045ff781b9 am: 5674b8e119 am...
Android Build Merger (Role) [Fri, 26 Jan 2018 22:14:43 +0000 (22:14 +0000)]
Merge "Merge "Added slot id in the internal API" am: 045ff781b9 am: 5674b8e119 am: da1f3a566a"

6 years agoMerge "Added slot id in the internal API" am: 045ff781b9 am: 5674b8e119
Jack Yu [Fri, 26 Jan 2018 22:14:21 +0000 (22:14 +0000)]
Merge "Added slot id in the internal API" am: 045ff781b9 am: 5674b8e119
am: da1f3a566a

Change-Id: I74871fd9c3630192efcce5bae68c2b34aeed7d45

6 years agoMerge "Proto enum reference for App Transitions"
TreeHugger Robot [Fri, 26 Jan 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Proto enum reference for App Transitions"

6 years agoAllow system jobs to be exempted from app-standby
Makoto Onuki [Fri, 26 Jan 2018 22:10:03 +0000 (14:10 -0800)]
Allow system jobs to be exempted from app-standby

This flag will allow the sync manager to exempt certain kind of sync requests.

- This will only exempt jobs from app-standby.

- EBS still won't exempt them. Battery saver cuts background network anyway, so
background syncs will still not work, and it didn't used to work pre-P either.

- Manual force-app standby still doesn't allow them to run.

Bug: 72443754
Test: Build and boot. The behavior shouldn't change since none uses the flag yet.
Test: atest CtsJobSchedulerTestCases
Change-Id: I806b97bb4b7da773479e878e6eccb792b03eadc1

6 years agoPrevent 2nd action down motionevent on nav bar press
Matthew Ng [Thu, 25 Jan 2018 01:01:08 +0000 (17:01 -0800)]
Prevent 2nd action down motionevent on nav bar press

Since motions events are proxied to launcher on intercept and on touch,
when user touches it used to send both. Prevent the action down proxy
event onTouchEvent will only send one touch event if nothing else
handles it.

Bug: 67957962
Test: manual
Change-Id: Ia2a6bfe6cd963f9383a1468f5ba64dc28005a394

6 years agoMerge "incidentd: Adding privacy tag and expanding field."
TreeHugger Robot [Fri, 26 Jan 2018 22:07:21 +0000 (22:07 +0000)]
Merge "incidentd: Adding privacy tag and expanding field."

6 years agoMerge "Added slot id in the internal API" am: 045ff781b9
Jack Yu [Fri, 26 Jan 2018 22:06:17 +0000 (22:06 +0000)]
Merge "Added slot id in the internal API" am: 045ff781b9
am: 5674b8e119

Change-Id: I12f2a0e8d75e593ac046368ee94d1f8d183d6ded

6 years agoMerge "Added slot id in the internal API"
Jack Yu [Fri, 26 Jan 2018 21:59:33 +0000 (21:59 +0000)]
Merge "Added slot id in the internal API"
am: 045ff781b9

Change-Id: I4222766dbd47c731b1612f9d4405375a7b4dd499

6 years agoMerge "v3 APK verification: reset por signedData after verification."
TreeHugger Robot [Fri, 26 Jan 2018 21:58:29 +0000 (21:58 +0000)]
Merge "v3 APK verification: reset por signedData after verification."

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c95d9b29e2 -s ours
Bill Yi [Fri, 26 Jan 2018 21:29:22 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c95d9b29e2  -s ours
am: 6331bfd209  -s ours

Change-Id: I23147707ca5e2349d9a86a1e8042d14b1495ec9d

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4b7b89b9a1 -s ours
Bill Yi [Fri, 26 Jan 2018 21:27:49 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4b7b89b9a1  -s ours
am: 9be01e0258  -s ours

Change-Id: I63bad0555c9ab4959e2fb073597de93d7477f0e8

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a2c154e0cd -s ours
Bill Yi [Fri, 26 Jan 2018 21:23:31 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a2c154e0cd  -s ours
am: da312d3a44  -s ours

Change-Id: Ic6a6339f1fa5f79b355785947d4796f56e6df8e5

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 497bbfd9ac -s ours
Bill Yi [Fri, 26 Jan 2018 21:21:55 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 497bbfd9ac  -s ours
am: 6ab6643d3e  -s ours

Change-Id: I18094c4478691bb3709222a945b304b0c9dc73fb

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28abd94074 -s ours
Bill Yi [Fri, 26 Jan 2018 21:20:37 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28abd94074  -s ours
am: 130f1a6b5e  -s ours

Change-Id: I2a87a73363d9e665db8616e320a08e487187a487

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:18:18 +0000 (21:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c95d9b29e2  -s ours

Change-Id: Id188e8eb53b6b3e9d0c468b550fc5ae4ad602289

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:15:34 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4b7b89b9a1  -s ours

Change-Id: I57dae4e6dda7c007c9571d415b3e3e0aa332a753

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: a2c154e0cd  -s ours

Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 497bbfd9ac  -s ours

Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 178e861e6e -s ours
Bill Yi [Fri, 26 Jan 2018 21:10:23 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 178e861e6e  -s ours
am: eeb9fba09d  -s ours

Change-Id: I0724912d370c2b7d157440d029673d0525b5b292

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9531d0fd0b -s ours
Bill Yi [Fri, 26 Jan 2018 21:08:08 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9531d0fd0b  -s ours
am: 0a56ce8d2f  -s ours

Change-Id: I5f64bda490f2f99f51f7f1e5714314d51e2e1d26

6 years agoAdd support for Multi-A2DP state machines per device
Pavlin Radoslavov [Thu, 4 Jan 2018 03:38:39 +0000 (19:38 -0800)]
Add support for Multi-A2DP state machines per device

* Update usage of A2dpService API calls that take BluetoothDevice
  as an additional argument
* Update the description for BluetoothA2dp.connect()

Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug: 69269748
Test: Manual
Change-Id: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
Merged-In: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
(cherry picked from commit 502af2192c6d291174efa434a70101f302a5bd97)

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 28abd94074  -s ours

Change-Id: I94d247f60e399547e4418859a014d2c48ac35674

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 178e861e6e  -s ours

Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9531d0fd0b  -s ours

Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Add logging to MemoryIntArray"
Philip P. Moltmann [Fri, 26 Jan 2018 20:49:08 +0000 (20:49 +0000)]
Merge "Add logging to MemoryIntArray"

6 years agoMerge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"

6 years agoMerge "Fix tests due to missing FLAG_START_NEW_TASK."
Sudheer Shanka [Fri, 26 Jan 2018 20:13:16 +0000 (20:13 +0000)]
Merge "Fix tests due to missing FLAG_START_NEW_TASK."

6 years agoRename RecoveryController.getRecoveryData() to getKeyChainSnapshot.
Dmitry Dementyev [Fri, 26 Jan 2018 19:49:34 +0000 (11:49 -0800)]
Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot.

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

Change-Id: I1a530414d255867786142fa2e01e50469379e295

6 years agoMerge "Get the themes outside of the resource lock"
TreeHugger Robot [Fri, 26 Jan 2018 19:55:28 +0000 (19:55 +0000)]
Merge "Get the themes outside of the resource lock"

6 years agoMerge "Copy hidden API blacklist/dark greylist into build folder" am: 656096516c...
David Brazdil [Fri, 26 Jan 2018 19:51:11 +0000 (19:51 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am: 656096516c am: 47f632d48f
am: 43f511a928

Change-Id: Ibf3581193d88df1916b1c2d57c94d01095cdac97

6 years agoMerge "Copy hidden API blacklist/dark greylist into build folder" am: 656096516c
David Brazdil [Fri, 26 Jan 2018 19:39:20 +0000 (19:39 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am: 656096516c
am: 47f632d48f

Change-Id: I99148ade6a6fafe63618312c228fbe6372e3b401

6 years agoMerge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53 am: 71411b877a
Primiano Tucci [Fri, 26 Jan 2018 19:38:21 +0000 (19:38 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53 am: 71411b877a
am: 8552eb769c  -s ours

Change-Id: Ia73b8d86b9291d9bad2163637832aa387262cc57

6 years agoMerge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53
Primiano Tucci [Fri, 26 Jan 2018 19:29:31 +0000 (19:29 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am: a946cc9f53
am: 71411b877a

Change-Id: I8c07b8650a508f03352075ac7bd6e7943f6cacb4

6 years agoRecreate recovery snapshot with current version if it is not stored.
Dmitry Dementyev [Fri, 26 Jan 2018 18:54:52 +0000 (10:54 -0800)]
Recreate recovery snapshot with current version if it is not stored.

Use Builder to create Parcelables.

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

Change-Id: Ieed92be627a8a2411353ce6a84b26dd7bde99401

6 years agoMerge "Added slot id in the internal API"
Jack Yu [Fri, 26 Jan 2018 19:25:13 +0000 (19:25 +0000)]
Merge "Added slot id in the internal API"

6 years agoMerge "Copy hidden API blacklist/dark greylist into build folder"
David Brazdil [Fri, 26 Jan 2018 19:24:35 +0000 (19:24 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
am: 656096516c

Change-Id: Icfda85f4f80516d6f4141be7ede7d047df6aeecf

6 years agoMerge "DropBoxManager: Allow adding a file using an fd"
Primiano Tucci [Fri, 26 Jan 2018 19:18:24 +0000 (19:18 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
am: a946cc9f53

Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46

6 years agoMerge "[QS] Update hotspot secondary label transient text"
TreeHugger Robot [Fri, 26 Jan 2018 19:13:36 +0000 (19:13 +0000)]
Merge "[QS] Update hotspot secondary label transient text"

6 years agoAdd Settings support for Bluetooth Multi-A2DP and Multi-HFP
Pavlin Radoslavov [Sun, 21 Jan 2018 10:59:15 +0000 (02:59 -0800)]
Add Settings support for Bluetooth Multi-A2DP and Multi-HFP

When there are multiple connected A2DP/HFP devices, if a connected
device's name is clicked on, that device will be chosen as
Active - i.e., it will be the device chosen for audio out / phone call.

Also:
 * Listen to the BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED
   and BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents
   and update the the status of the current active device.
 * When connecting a new device, and Multi-A2DP is enabled, don't
   disconnect the currently connected device.
 * Update the implementation of isA2dpPlaying() so it correctly checks
   all connected devices, not only the first one.

Test: Manual: multiple connected A2DP devices, and selecting each as
      the Active Device.
Bug: 64767509

Change-Id: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
Merged-In: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
(cherry picked from commit 1af33a192614bb490701ab2e8e21866690b3b4fa)

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev am: 7ebe5f0ba1
Chad Brubaker [Fri, 26 Jan 2018 19:01:24 +0000 (19:01 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev am: 7ebe5f0ba1
am: c8f0e0dab9

Change-Id: I37e08077152850e290b71cf9ceadbff374dd4183

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
Chad Brubaker [Fri, 26 Jan 2018 18:52:47 +0000 (18:52 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
am: 7ebe5f0ba1

Change-Id: I39d11196229806e4f1fdb171623d8cd94b1d3fbf

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc ...
Android Build Merger (Role) [Fri, 26 Jan 2018 18:44:23 +0000 (18:44 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc  -s ours am: c241610486  -s ours"

6 years agoMerge "Implement UI for warn-on-launch"
Ben Gruver [Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)]
Merge "Implement UI for warn-on-launch"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc -s ours
Bill Yi [Fri, 26 Jan 2018 18:43:51 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc  -s ours
am: c241610486  -s ours

Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c358d2b6dc  -s ours

Change-Id: I99e0718b5e031415d04140d76176f569b9576e04

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Let the job scheduler know when the user interacts with an app"
Chris Tate [Fri, 26 Jan 2018 18:21:04 +0000 (18:21 +0000)]
Merge "Let the job scheduler know when the user interacts with an app"

6 years agoMerge "Send less touches to the seekbar"
TreeHugger Robot [Fri, 26 Jan 2018 18:19:43 +0000 (18:19 +0000)]
Merge "Send less touches to the seekbar"

6 years agoMerge "Migrate some Suggestions related classes to SettingsLib(I)."
Zhizhi Liu [Fri, 26 Jan 2018 18:16:42 +0000 (18:16 +0000)]
Merge "Migrate some Suggestions related classes to SettingsLib(I)."

6 years agoMerge "Fix writing transfer ownership bundle"
TreeHugger Robot [Fri, 26 Jan 2018 17:57:28 +0000 (17:57 +0000)]
Merge "Fix writing transfer ownership bundle"

6 years agoMerge "Revert "Add developer setting to set the default GPU renderer.""
TreeHugger Robot [Fri, 26 Jan 2018 17:50:55 +0000 (17:50 +0000)]
Merge "Revert "Add developer setting to set the default GPU renderer.""

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 26 Jan 2018 17:04:23 +0000 (09:04 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3b82c404d34ad6d9560e1c8b0e31ff9223394022

6 years agoMerge "Do not throttle EXEMPT apps on battery saver"
Makoto Onuki [Fri, 26 Jan 2018 16:43:08 +0000 (16:43 +0000)]
Merge "Do not throttle EXEMPT apps on battery saver"

6 years agoMerge "Adding privacy tags to Settings proto."
TreeHugger Robot [Fri, 26 Jan 2018 16:40:11 +0000 (16:40 +0000)]
Merge "Adding privacy tags to Settings proto."

6 years agov3 APK verification: reset por signedData after verification.
Dan Cashman [Fri, 26 Jan 2018 13:37:54 +0000 (05:37 -0800)]
v3 APK verification: reset por signedData after verification.

During the proof-of-rotation additional attribute parsing, each
new certificate needs to be verified by the last.  When doing this
verification, the ByteBuffer position is advanced to its limit, but
it needs to be read again to extract the certificate.  Reset the
signedData ByteBuffer to its original position.

Bug: 64686581
Test: Builds, boots, v3 signed app with rotated cert installs.
Change-Id: Ie95e4c7e99e3cfb9a987638a0c641456af2f34d9

6 years agoMerge "Revert "MediaSession2 API set for audio focus handling""
Insun Kang [Fri, 26 Jan 2018 16:31:31 +0000 (16:31 +0000)]
Merge "Revert "MediaSession2 API set for audio focus handling""

6 years agoRevert "MediaSession2 API set for audio focus handling"
Insun Kang [Fri, 26 Jan 2018 16:28:40 +0000 (16:28 +0000)]
Revert "MediaSession2 API set for audio focus handling"

This reverts commit b4689ed97f85f92d466702b8b81956c189606ce3.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I76f1318941466c10fe08a49a87e4d529aa96391a

6 years agoMerge "Remove @removed trySetQuietModeEnabled"
TreeHugger Robot [Fri, 26 Jan 2018 16:14:04 +0000 (16:14 +0000)]
Merge "Remove @removed trySetQuietModeEnabled"

6 years agoRemove @removed trySetQuietModeEnabled
Tony Mak [Thu, 25 Jan 2018 11:18:13 +0000 (11:18 +0000)]
Remove @removed trySetQuietModeEnabled

Context:
Updated the API according to API council feedback. Marked it as
@Removed and keep it for a while for Launcher. But now Launcher
prebuilt is updated, we are safe to remove it.

Test: Build

BUG: 71818127

Change-Id: I33fec12addf7031bfbcd86bce9e636c31d0ea4d3

6 years agoMerge "QS dnd icon is always the same dnd icon"
TreeHugger Robot [Fri, 26 Jan 2018 16:04:29 +0000 (16:04 +0000)]
Merge "QS dnd icon is always the same dnd icon"

6 years agoMerge "Copy hidden API blacklist/dark greylist into build folder"
David Brazdil [Fri, 26 Jan 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"

6 years agoMerge "DropBoxManager: Allow adding a file using an fd"
Treehugger Robot [Fri, 26 Jan 2018 15:51:57 +0000 (15:51 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 26 Jan 2018 15:25:46 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2c25ff050a1cee7b26d5939f98fdb9bc4809141c

6 years agoMerge "MediaSession2 API set for audio focus handling"
Jaewan Kim [Fri, 26 Jan 2018 15:18:10 +0000 (15:18 +0000)]
Merge "MediaSession2 API set for audio focus handling"