OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "AM: refactor LockTask whitelist update logic."
Charles He [Mon, 18 Sep 2017 16:13:55 +0000 (16:13 +0000)]
Merge "AM: refactor LockTask whitelist update logic."

6 years agoMerge "Added WindowConfigurationProto and friends"
TreeHugger Robot [Mon, 18 Sep 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Added WindowConfigurationProto and friends"

6 years agoMerge "[RefactoredBMS] Don't mix "current dataset" tokens for different backup transp...
TreeHugger Robot [Mon, 18 Sep 2017 15:52:44 +0000 (15:52 +0000)]
Merge "[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports"

6 years agoMerge changes I5e42dee6,Ic8571c08
TreeHugger Robot [Mon, 18 Sep 2017 15:08:09 +0000 (15:08 +0000)]
Merge changes I5e42dee6,Ic8571c08

* changes:
  [RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time
  [RefactoredBMS] Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice

6 years agoMerge "Status bar: correctly register disable flags"
Charles He [Mon, 18 Sep 2017 14:49:02 +0000 (14:49 +0000)]
Merge "Status bar: correctly register disable flags"

6 years agoMerge "Test that the replace flag does not need to be set"
TreeHugger Robot [Mon, 18 Sep 2017 14:24:41 +0000 (14:24 +0000)]
Merge "Test that the replace flag does not need to be set"

6 years agoAdded WindowConfigurationProto and friends
Wale Ogunwale [Wed, 13 Sep 2017 12:55:07 +0000 (05:55 -0700)]
Added WindowConfigurationProto and friends

Also added WindowContainerProto and ConfigurationContainerProto
Will be used by cts tests in upcoming CLs that replace StackId APIs.

Test: adb shell dumpsys window --proto
Bug: 64146578
Change-Id: Id6ca2a93e3d15ac696ab54cb241870e973985967

6 years agoMerge "[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel() call from...
TreeHugger Robot [Mon, 18 Sep 2017 14:15:55 +0000 (14:15 +0000)]
Merge "[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread"

6 years agoMerge "[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent."
TreeHugger Robot [Mon, 18 Sep 2017 14:07:49 +0000 (14:07 +0000)]
Merge "[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent."

6 years agoAM: refactor LockTask whitelist update logic.
Charles He [Sat, 2 Sep 2017 14:27:16 +0000 (15:27 +0100)]
AM: refactor LockTask whitelist update logic.

Previously, ActivityManagerService owned the LockTask package whitelist,
whereas LockTaskController contained the update logic. In this refactor,
we simplify the structure by moving the whitelist into LockTaskController.
We also add instrumentation tests to verify this behavior.

Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: runtest frameworks-services
Test: go/wm-smoke
Test: cts-tradefed run cts-dev -m DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug: 63909481
Change-Id: I15ef4a446de800336f2bf9cbbd4acf6685e29320

6 years agoMerge "Ignore only internal volume keys when in VR mode."
TreeHugger Robot [Mon, 18 Sep 2017 13:53:05 +0000 (13:53 +0000)]
Merge "Ignore only internal volume keys when in VR mode."

6 years ago[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports
Michal Karpinski [Mon, 18 Sep 2017 13:32:42 +0000 (14:32 +0100)]
[RefactoredBMS] Don't mix "current dataset" tokens for different backup transports

This CL replicates ag/2191170 in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: Ic3fd528071cef8143e2c3f6b659722f951f0deb9

6 years agoStatus bar: correctly register disable flags
Charles He [Mon, 18 Sep 2017 08:19:28 +0000 (09:19 +0100)]
Status bar: correctly register disable flags

StatusBarManager has two sets of disable flags to control the visibility
of various UI components. These flags are registered in DisableRecord.
This CL fixes a bug where clearing one set of disable flags causes both
sets of flags to be cleared.

Bug: 65813446
Test: runtest systemui
Change-Id: I95948fd2464402b6f2fd123dba34b64aeeb80c90

6 years ago[RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time
Michal Karpinski [Mon, 18 Sep 2017 13:15:56 +0000 (14:15 +0100)]
[RefactoredBMS] Ensure backup doesn't reuse ack tokens nearby in time

This CL replicates both ag/2551800 and ag/2613950 in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I5e42dee67d587adabbfb81de03f3205d92a46add

6 years agoMerge changes I3d638a98,I55d18254
TreeHugger Robot [Mon, 18 Sep 2017 13:00:55 +0000 (13:00 +0000)]
Merge changes I3d638a98,I55d18254

* changes:
  [RefactoredBMS] Add tracing for UserState and a few services
  [RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()

6 years ago[RefactoredBMS] Eliminate a race condition that could lead to
Michal Karpinski [Mon, 18 Sep 2017 12:44:12 +0000 (13:44 +0100)]
[RefactoredBMS] Eliminate a race condition that could lead to
calling PBT#finalizeBackup() twice

This CL replicates ag/2510127 in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: Ic8571c08dd92386d0e4f79d7866aeb0f19f38106

6 years ago[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel()
Michal Karpinski [Mon, 18 Sep 2017 12:34:39 +0000 (13:34 +0100)]
[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel()
call from the main thread to another thread

This CL replicates both ag/2135862 and ag/2465381 in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I895cb27bc910d9970ab1c33cd54a773b8f9b6cf6

6 years ago[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent.
Michal Karpinski [Mon, 18 Sep 2017 12:23:47 +0000 (13:23 +0100)]
[RefactoredBMS] Add log before doRestoreFinished is called on BackupAgent.

This CL replicates ag/2140301 in RefactoredBMS.

Test: runtest -p com.android.server.backup frameworks-services
Bug: 37973765
Change-Id: I2c2795c89035dd6c38aee8aec4e4a95cfdba0846

6 years ago[RefactoredBMS] Add tracing for UserState and a few services
Michal Karpinski [Mon, 18 Sep 2017 11:23:49 +0000 (12:23 +0100)]
[RefactoredBMS] Add tracing for UserState and a few services

This CL replicates ag/2500023 in RefactoredBMS.

Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Bug: 37973765
Change-Id: I3d638a98ff61954797d9e5a70a28e0c2962112c6

6 years ago[RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackup...
Michal Karpinski [Mon, 18 Sep 2017 11:20:29 +0000 (12:20 +0100)]
[RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()

This CL replicates ag/2147459 in RefactoredBMS.

Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Bug: 37973765
Change-Id: I55d1825477ce82c47fd5850bf00f34ee8c1b9fc0

6 years agoMerge "Remove use of MeasureUnit.internalGetInstance"
Joachim Sauer [Mon, 18 Sep 2017 10:37:47 +0000 (10:37 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance"

6 years agoMerge "Fix consequent activity launch on virtual displays" into oc-mr1-dev am: 7a09f7ec9c
Andrii Kulian [Mon, 18 Sep 2017 06:45:45 +0000 (06:45 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev am: 7a09f7ec9c
am: af642f5914

Change-Id: Ib141af3ec3bf37dac236f43cb19e64b5837e9c27

6 years agoMerge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
Andrii Kulian [Mon, 18 Sep 2017 06:35:15 +0000 (06:35 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
am: 7a09f7ec9c

Change-Id: I97fb5d929215147d9512bc89f3fd55f528b84393

6 years agoMerge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
Andrii Kulian [Mon, 18 Sep 2017 06:25:46 +0000 (06:25 +0000)]
Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev

6 years agoMerge "Change the route name for USB headset"
Sungsoo Lim [Mon, 18 Sep 2017 04:28:47 +0000 (04:28 +0000)]
Merge "Change the route name for USB headset"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f81baeee -s ours
Bill Yi [Sun, 17 Sep 2017 22:37:32 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f81baeee  -s ours
am: 72b2814607  -s ours

Change-Id: Ib26e3fc87a63259b4a8aace9672cb87edce2a116

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 17 Sep 2017 22:26:21 +0000 (22:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c3f81baeee  -s ours

Change-Id: I4046d8802fbeae277932717571509c1e0d6537ca

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 17 Sep 2017 22:18:14 +0000 (22:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329 -s ours
Bill Yi [Sat, 16 Sep 2017 21:24:54 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329  -s ours
am: 52ff2bf2a1  -s ours

Change-Id: I0384a49cb23e1f48509582e71909f7245482ec15

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b4683842d -s ours
Bill Yi [Sat, 16 Sep 2017 21:12:11 +0000 (21:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b4683842d  -s ours
am: e43dfbad3b  -s ours

Change-Id: I98987578264825dd13d5519c9e40b2865d45715c

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 420ae05329  -s ours

Change-Id: I2e7ae35b30cdf2c3f8b047f279e385d1a961b6c6

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ba3347b48a -s ours
Bill Yi [Sat, 16 Sep 2017 21:05:53 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ba3347b48a  -s ours
am: 2e3be621b6  -s ours

Change-Id: I090819b1cae93821cb2b9a135a511724813ed724

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:52:54 +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 am: adbd504f40 -s ours
Bill Yi [Sat, 16 Sep 2017 20:51:01 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: adbd504f40  -s ours
am: 2a8bb45240  -s ours

Change-Id: I9938a0ebaa742d84ba067dd9034551510c74b4e0

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9b4683842d  -s ours

Change-Id: I181876ca8f124875296af5c91d90788d44e6e690

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:46:31 +0000 (20:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: ba3347b48a  -s ours

Change-Id: I51b7f30fb9f32d74eb4a5df4fa0b84da834510c1

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4498012c8b -s ours
Bill Yi [Sat, 16 Sep 2017 20:43:29 +0000 (20:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4498012c8b  -s ours
am: acc482472c  -s ours

Change-Id: I425ba41ae996e418d280326c58a2d1e87f5a615d

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3231634e2b -s ours
Bill Yi [Sat, 16 Sep 2017 20:34:19 +0000 (20:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3231634e2b  -s ours
am: 62ee030f38  -s ours

Change-Id: I5e5a7af38854b1d5a5c15aa5fdcb128323e96bb4

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: adbd504f40  -s ours

Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e0b4672a4e -s ours
Bill Yi [Sat, 16 Sep 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e0b4672a4e  -s ours
am: 55f717f446  -s ours

Change-Id: Ic808ffbe7cbfae810aae478a951ad65a9ba6cccb

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:26:10 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4498012c8b  -s ours

Change-Id: I250606ea6088f6deedd77aec93af2c615488ded7

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a340ff61 -s ours
Bill Yi [Sat, 16 Sep 2017 20:22:56 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a340ff61  -s ours
am: 4a4fda8901  -s ours

Change-Id: Ic16e122490cfcee5796974c2c30f1c2e1a9e8892

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:22:13 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 3231634e2b  -s ours

Change-Id: Ied3dddf8b55950c972a22bb1f1c9f2ceb6063318

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:19:42 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fa04d2e02a -s ours
Bill Yi [Sat, 16 Sep 2017 20:18:48 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fa04d2e02a  -s ours
am: 7e1d4c91b9  -s ours

Change-Id: I308b234ddaca3768836fbf88b8f45704cdc470b3

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:17:07 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e0b4672a4e  -s ours

Change-Id: Ic055179f584322b0cfa1f4228ee418ecd17d3e32

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 22d6738d16 -s ours
Bill Yi [Sat, 16 Sep 2017 20:12:06 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 22d6738d16  -s ours
am: 6ea0804dfc  -s ours

Change-Id: Iabc68690a3172afce6821591d42dc9a2157e1d33

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:12:00 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 14a340ff61  -s ours

Change-Id: Ice521e238b961521fd240f13a9481c551fe4e6f2

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: fa04d2e02a  -s ours

Change-Id: Ifbf67ba7f1c928c2231ef56615a3e4a043fd93d2

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9a2468011f -s ours
Bill Yi [Sat, 16 Sep 2017 20:08:14 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9a2468011f  -s ours
am: ff2ef3477f  -s ours

Change-Id: I8d4b998707f586d0b1a6b93e8515d9dc44efd3be

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:05:22 +0000 (20:05 +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 [Sat, 16 Sep 2017 20:02:32 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 20:01:58 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 22d6738d16  -s ours

Change-Id: Ic81940cfa222f3ac337e053d10338cfa9108ce54

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 20:01:27 +0000 (20:01 +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 [Sat, 16 Sep 2017 20:00:33 +0000 (20:00 +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 [Sat, 16 Sep 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fc9d5e5764 -s ours
Bill Yi [Sat, 16 Sep 2017 19:58:19 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: fc9d5e5764  -s ours
am: ee7c521595  -s ours

Change-Id: I6c6611dc22b79ce04981a4a14284f96ca7f30b2a

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9a2468011f  -s ours

Change-Id: I151617e795e41cadc3dbd7d97a065c1c5672d74a

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:53:46 +0000 (19:53 +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 [Sat, 16 Sep 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Do not stop paused activity when sleeping." into oc-mr1-dev am: af17d47351
Bryce Lee [Sat, 16 Sep 2017 19:50:38 +0000 (19:50 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev am: af17d47351
am: 89c87991a3

Change-Id: Id1c906f9263d8ff9226469ba7d3c0d860909d738

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:50:26 +0000 (19: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 [Sat, 16 Sep 2017 19:48:53 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 19:47:33 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: fc9d5e5764  -s ours

Change-Id: I5d22fdc3bd8914926c13cf0d0a832b1eedab6e36

6 years agoMerge "Do not stop paused activity when sleeping." into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:42:38 +0000 (19:42 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev
am: af17d47351

Change-Id: I67a82290d737949a60a69d55aabacde51407a007

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:33:49 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Do not stop paused activity when sleeping." into oc-mr1-dev
Bryce Lee [Sat, 16 Sep 2017 19:33:21 +0000 (19:33 +0000)]
Merge "Do not stop paused activity when sleeping." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 13:17:52 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ided02ec91e7a2f5aacd8e5c28201672d14fceea7

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 12:57:19 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I6dab1e6544868c0ac2e0e4029a969a216f4c9b4d

6 years agoMerge "Fix InputMethodPreference.compareTo method"
TreeHugger Robot [Sat, 16 Sep 2017 11:46:45 +0000 (11:46 +0000)]
Merge "Fix InputMethodPreference.compareTo method"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 06:57:48 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic2ce0ef69af1bfd9f4b8980b3079b9756f93763c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 06:50:17 +0000 (23:50 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I431251ef3dc0930b820a108edc6b76f876639035

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:55:46 +0000 (21:55 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic586e92feca951793fd3cb9a401093e57e05b015

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:48:17 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I81c38a635544d1672a6cbd1dc9528d95ccdbd894

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:40:45 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I3978b88537a89176a6926eab1c21e09ab169a2cc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:33:13 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ib786e99af653b130f2547c8ed1e223f0ddbcf3c8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:18:28 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ie25a5101373e7c24af943b998a27f6f02da62a34

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 04:03:41 +0000 (21:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I8d182fda9abf6a8c4f5bb4f62de78e61a5c3d627

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 03:56:07 +0000 (20:56 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ifdd0077f7516e9266a9f38ff474bc8f71cc7591b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 03:48:15 +0000 (20:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I61400c4699a3694bc91bc6672e7dc62a28545bcc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 03:43:03 +0000 (20:43 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ie76a52fa6f6c717d78db5f9c338b1fde5cc6b4ad

6 years agoMerge "Avoid spaces in the trace file names."
TreeHugger Robot [Sat, 16 Sep 2017 02:53:53 +0000 (02:53 +0000)]
Merge "Avoid spaces in the trace file names."

6 years agoMerge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev am...
Felipe Leme [Sat, 16 Sep 2017 02:01:40 +0000 (02:01 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev am: a8c2b36b33
am: 631b987234

Change-Id: Ic7a986486bc0e5a2e4cda86001b919e14aece214

6 years agoMerge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
Felipe Leme [Sat, 16 Sep 2017 01:53:46 +0000 (01:53 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
am: a8c2b36b33

Change-Id: I771b71a9c189c7eeae30524bd155b5e4f94ad681

6 years agoMerge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fixed size of autofill service icon on Save affordance." into oc-mr1-dev

6 years agoAvoid spaces in the trace file names.
gopinath [Sat, 16 Sep 2017 01:09:02 +0000 (18:09 -0700)]
Avoid spaces in the trace file names.

Having spaces in the trace file names introduces slashes in the
file names and not able to pull the file names with the slashes
from the device.So avoid having spaces while constructing the
trace file names.

Bug : b/65737738

Change-Id: Ie1971566586f77d18b17722ce0e3cc9ef3ebfdd3

6 years agoMerge "Adding ability to add configs via adb command-line. The input must be in seria...
TreeHugger Robot [Sat, 16 Sep 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Adding ability to add configs via adb command-line. The input must be in serialized binary format. Also fixes small issue in build rule related to proto lib."

6 years agoMerge "Color extraction should not block switchUser" into oc-mr1-dev am: 4f65a35713
Lucas Dupin [Fri, 15 Sep 2017 23:30:52 +0000 (23:30 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev am: 4f65a35713
am: c910573484

Change-Id: I507c2ab2a39df004ebca354fbee9a4150f9a818d

6 years agoMerge "Color extraction should not block switchUser" into oc-mr1-dev
Lucas Dupin [Fri, 15 Sep 2017 23:23:48 +0000 (23:23 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev
am: 4f65a35713

Change-Id: Ic77d657bef1e7336e1774395da26886e4840a03c

6 years agoMerge "Color extraction should not block switchUser" into oc-mr1-dev
Lucas Dupin [Fri, 15 Sep 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Color extraction should not block switchUser" into oc-mr1-dev

6 years agoFixed size of autofill service icon on Save affordance.
Felipe Leme [Fri, 15 Sep 2017 19:56:55 +0000 (12:56 -0700)]
Fixed size of autofill service icon on Save affordance.

Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 65739885

Change-Id: Ic9efd7bbb853c28b2d869a609d21eff4e6ef6d2d

6 years agoMerge "Move long-running calls to async with listeners."
Jeff Sharkey [Fri, 15 Sep 2017 22:46:00 +0000 (22:46 +0000)]
Merge "Move long-running calls to async with listeners."

6 years agoDo not stop paused activity when sleeping.
Bryce Lee [Fri, 15 Sep 2017 22:22:43 +0000 (15:22 -0700)]
Do not stop paused activity when sleeping.

This changelist removes logic added to stop a top level paused
activity when trying to sleep. Doing so delays sleep and leads to
double sleep requests on the client side as it will also try to
stop the activity on sleep.

Bug: 65457314
Test: manual
Change-Id: I252e2b968a537cf2d696972d6a65e43661875943

6 years agoMerge "Increased the text size for colorized notifications" into oc-mr1-dev am: dd3b6...
Selim Cinek [Fri, 15 Sep 2017 21:34:25 +0000 (21:34 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev am: dd3b6c83c6
am: f83e81117a

Change-Id: Ideb598d0c28ce8bb0b84913e4683dda453d522a6

6 years agoMerge "BackupManagerService uses BackupManagerConstants."
Tim Zheng [Fri, 15 Sep 2017 21:28:14 +0000 (21:28 +0000)]
Merge "BackupManagerService uses BackupManagerConstants."

6 years agoMerge "Increased the text size for colorized notifications" into oc-mr1-dev
Selim Cinek [Fri, 15 Sep 2017 21:26:46 +0000 (21:26 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
am: dd3b6c83c6

Change-Id: Ifd1e83f3400bd870d087c1a248bb74b305aa313f

6 years agoMerge "Increased the text size for colorized notifications" into oc-mr1-dev
Selim Cinek [Fri, 15 Sep 2017 21:20:44 +0000 (21:20 +0000)]
Merge "Increased the text size for colorized notifications" into oc-mr1-dev

6 years agoAdding ability to add configs via adb command-line. The input
David Chen [Wed, 13 Sep 2017 22:53:39 +0000 (15:53 -0700)]
Adding ability to add configs via adb command-line. The input
must be in serialized binary format. Also fixes small issue
in build rule related to proto lib.

Test: Manually tested that ADB command works without crashing.

Change-Id: Iba2e677561ff500adb601a598f73e8a7b32540e5

6 years agoMove long-running calls to async with listeners.
Jeff Sharkey [Fri, 15 Sep 2017 18:57:59 +0000 (12:57 -0600)]
Move long-running calls to async with listeners.

Now that we're using Binder, we can have callers provide explicit
listeners for every request instead of trying to squeeze them all
into unsolicited socket events.

Move benchmarking to be async to avoid blocking other commands for
up to several minutes.  Remove post-trim benchmarking flag, since
benchmarking now requires a separate callback.  Will bring back in
a future CL.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: adb shell sm fstrim
Bug: 6220120913758960
Change-Id: I26f76c66734ac2fd0f64713b8ab9828430499019

6 years agoMerge "MediaPlayer: add notifyAt for TimeProvider"
TreeHugger Robot [Fri, 15 Sep 2017 20:15:35 +0000 (20:15 +0000)]
Merge "MediaPlayer: add notifyAt for TimeProvider"