OSDN Git Service

android-x86/frameworks-base.git
7 years agoTemporarily enable HWUI opengl validation
Chris Craik [Wed, 31 May 2017 23:05:48 +0000 (16:05 -0700)]
Temporarily enable HWUI opengl validation

Bug: 38416992
Test: device boots

Change-Id: I20b7e3546f29c0a0d3e41a7cdafbcc5f4ad387e2

7 years agoMerge "Add parameters for Wifi partial scan trigger"
Randy Pan [Wed, 31 May 2017 17:25:17 +0000 (17:25 +0000)]
Merge "Add parameters for Wifi partial scan trigger"

7 years agoMerge "Fix for wifi detail icon disappearing" into oc-dev am: db0836779e
Evan Laird [Wed, 31 May 2017 16:45:56 +0000 (16:45 +0000)]
Merge "Fix for wifi detail icon disappearing" into oc-dev am: db0836779e
am: 9821fb5b08

Change-Id: I82b1989ce739ad2ea11b904030cbda8b951b0574

7 years agoMerge "Fix for wifi detail icon disappearing" into oc-dev
Evan Laird [Wed, 31 May 2017 16:37:25 +0000 (16:37 +0000)]
Merge "Fix for wifi detail icon disappearing" into oc-dev
am: db0836779e

Change-Id: Ie2fe3a75bd3baa5181cd1b1cb7a2b2d220072b81

7 years agoMerge "Fix for wifi detail icon disappearing" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 16:28:51 +0000 (16:28 +0000)]
Merge "Fix for wifi detail icon disappearing" into oc-dev

7 years agoMerge "Don't crash when presented with non-roundRect clipping outline." into oc-dev...
Derek Sollenberger [Wed, 31 May 2017 16:28:51 +0000 (16:28 +0000)]
Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev am: 2b81530bd2
am: 86c40b5099

Change-Id: Ia5b5fb05cc1eb6d04396bf599617ed6bca40e748

7 years agoMerge "Fix header not set on initialization" into oc-dev am: 388ceaa37a
Lucas Dupin [Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)]
Merge "Fix header not set on initialization" into oc-dev am: 388ceaa37a
am: d9a707e59d

Change-Id: I854b8bb4df0d18b053193737c33f8a593ae53f1a

7 years agoMerge "WifiManager: setWifiApEnabled always returns false" into oc-dev am: c0643da09e
Rebecca Silberstein [Wed, 31 May 2017 16:14:49 +0000 (16:14 +0000)]
Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev am: c0643da09e
am: 84296900b0

Change-Id: I500e8256583aa05b0fd2096988e34de6d1ed0f3c

7 years agoMerge "Don't crash when presented with non-roundRect clipping outline." into oc-dev
Derek Sollenberger [Wed, 31 May 2017 16:09:50 +0000 (16:09 +0000)]
Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev
am: 2b81530bd2

Change-Id: I9da0d02131eefdb38b6025d4cdc6fb27ab3c82f2

7 years agoMerge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev am: 0b457...
Yoshinori Hirano [Wed, 31 May 2017 16:06:24 +0000 (16:06 +0000)]
Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev am: 0b45799abc
am: 2edd5e763a

Change-Id: I2386bf91d9e805f4b12c63d7732140302236dbee

7 years agoMerge "Don't crash when presented with non-roundRect clipping outline." into oc-dev
TreeHugger Robot [Wed, 31 May 2017 16:04:23 +0000 (16:04 +0000)]
Merge "Don't crash when presented with non-roundRect clipping outline." into oc-dev

7 years agoMerge "Fix header not set on initialization" into oc-dev
Lucas Dupin [Wed, 31 May 2017 16:02:16 +0000 (16:02 +0000)]
Merge "Fix header not set on initialization" into oc-dev
am: 388ceaa37a

Change-Id: Ia706458360372059715ea86873dbbefc854731d6

7 years agoMerge "WifiManager: setWifiApEnabled always returns false" into oc-dev
Rebecca Silberstein [Wed, 31 May 2017 15:59:37 +0000 (15:59 +0000)]
Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev
am: c0643da09e

Change-Id: Ibaec59c3416f502c6ff9b131d12f38c6205f2287

7 years agoMerge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
Yoshinori Hirano [Wed, 31 May 2017 15:57:00 +0000 (15:57 +0000)]
Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
am: 0b45799abc

Change-Id: I1cd5fb3d0d6ca3bbd98be741a265ef7561097d4b

7 years agoMerge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev am: 69bf3ea86d
Paul Duffin [Wed, 31 May 2017 15:56:51 +0000 (15:56 +0000)]
Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev am: 69bf3ea86d
am: 27c0596f1c

Change-Id: I690196a85d42b7f56b54e71e2df2d96f93fa323f

7 years agoMerge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev
Paul Duffin [Wed, 31 May 2017 15:46:29 +0000 (15:46 +0000)]
Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev
am: 69bf3ea86d

Change-Id: Id3c170a155aebc448b41091604d57f85e3c411a5

7 years agoMerge "Fix header not set on initialization" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 15:42:52 +0000 (15:42 +0000)]
Merge "Fix header not set on initialization" into oc-dev

7 years agoMerge "WifiManager: setWifiApEnabled always returns false" into oc-dev
Rebecca Silberstein [Wed, 31 May 2017 15:42:27 +0000 (15:42 +0000)]
Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev

7 years agoMerge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 15:41:58 +0000 (15:41 +0000)]
Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev

7 years agoMerge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 15:37:42 +0000 (15:37 +0000)]
Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev

7 years agoMerge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
Jeff Sharkey [Wed, 31 May 2017 14:54:24 +0000 (14:54 +0000)]
Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
am: 3c3d9d8158

Change-Id: Ia4c7f1792c9b6e8e72b4ffe742249b02b82d0817

7 years agoMerge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
Jeff Sharkey [Wed, 31 May 2017 14:43:51 +0000 (08:43 -0600)]
Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit

Change-Id: Ifa69c7bb53de94312e2b32607fa098c194a4c72c

7 years agoMerge "Consistent "low storage" behavior." into oc-dev
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev

7 years agoMerge "Remove unneeded Skia include in ReorderBarrierDrawables.cpp"
TreeHugger Robot [Wed, 31 May 2017 14:15:06 +0000 (14:15 +0000)]
Merge "Remove unneeded Skia include in ReorderBarrierDrawables.cpp"

7 years agoMerge "Fix infinite loop problem in AnimationHandler" into oc-dev am: 163ec051d1
Chet Haase [Wed, 31 May 2017 14:11:47 +0000 (14:11 +0000)]
Merge "Fix infinite loop problem in AnimationHandler" into oc-dev am: 163ec051d1
am: 3fb0e7555f

Change-Id: I91064e4baf1333c25d55d06e4373c83243c3e0da

7 years agoMerge "Fix infinite loop problem in AnimationHandler" into oc-dev
Chet Haase [Wed, 31 May 2017 14:01:33 +0000 (14:01 +0000)]
Merge "Fix infinite loop problem in AnimationHandler" into oc-dev
am: 163ec051d1

Change-Id: I56250bcf79be21354469098598f8d3f39dc0d2de

7 years agoMerge "Fix infinite loop problem in AnimationHandler" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 13:53:09 +0000 (13:53 +0000)]
Merge "Fix infinite loop problem in AnimationHandler" into oc-dev

7 years agoMerge "Use assertExpectException in DPMS test."
Pavel Grafov [Wed, 31 May 2017 13:46:45 +0000 (13:46 +0000)]
Merge "Use assertExpectException in DPMS test."

7 years agoHide Wi-Fi activity indicator when Wi-Fi icon is hidden
Yoshinori Hirano [Fri, 26 May 2017 02:53:34 +0000 (11:53 +0900)]
Hide Wi-Fi activity indicator when Wi-Fi icon is hidden

Wi-Fi icon in the status bar can be blocked by System UI Tuner.
So the activity indicator should be hidden.

Fixes: 62211154
Test: manual - block Wi-Fi icon

Author: Akira Oshimi <akira.oshimi@sony.com>
Change-Id: Iba698d621d60f6d6c9f6d8205f91df49806f3f54

7 years agoMerge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6
Hugo Benichi [Wed, 31 May 2017 13:34:20 +0000 (13:34 +0000)]
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6
am: 871e6759ac

Change-Id: Ia9237e9be9db7447985726be06a3d9020ab72087

7 years agoMerge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827
Hugo Benichi [Wed, 31 May 2017 13:25:53 +0000 (13:25 +0000)]
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827
am: ba82d646a6

Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69

7 years agoMerge "Fix race condition in NsdManagerTest" am: f2383db747
Hugo Benichi [Wed, 31 May 2017 13:16:43 +0000 (13:16 +0000)]
Merge "Fix race condition in NsdManagerTest" am: f2383db747
am: 2dfb494827

Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7

7 years agoMerge "Fix race condition in NsdManagerTest"
Hugo Benichi [Wed, 31 May 2017 13:08:37 +0000 (13:08 +0000)]
Merge "Fix race condition in NsdManagerTest"
am: f2383db747

Change-Id: Ifd731767608e738a271bd5793a462675c2a93123

7 years agoMerge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e am: 6bc21997...
daqi [Wed, 31 May 2017 12:59:21 +0000 (12:59 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e am: 6bc2199774 am: 8274806df3
am: 380758a685

Change-Id: I8d395beb2f47e1971a1d188796f44f450afb34db

7 years agoMerge "Fix race condition in NsdManagerTest"
Treehugger Robot [Wed, 31 May 2017 12:56:55 +0000 (12:56 +0000)]
Merge "Fix race condition in NsdManagerTest"

7 years agoMerge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e am: 6bc2199774
daqi [Wed, 31 May 2017 12:50:47 +0000 (12:50 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e am: 6bc2199774
am: 8274806df3

Change-Id: Ie2053782986f98db28e192b08c3d249bb9c04e30

7 years agoMerge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e
daqi [Wed, 31 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime" am: 30895c5e1e
am: 6bc2199774

Change-Id: Idf798414b9d7d4c41d59c4b57c313e1030cba119

7 years agoRemove unneeded Skia include in ReorderBarrierDrawables.cpp
Florin Malita [Tue, 30 May 2017 17:44:49 +0000 (13:44 -0400)]
Remove unneeded Skia include in ReorderBarrierDrawables.cpp

SkGaussianEdgeShader.h is a private Skia header, and not
used at all in ReorderBarrierDrawables.cpp.

Test: refactoring CL. Existing unit tests still pass.

Change-Id: I01c6b2a9ce53617ce338a7fbd45554d2d2604c9e
Signed-off-by: Florin Malita <fmalita@google.com>
(cherry picked from commit 4bb94d19c6771cf886f1e94dbc2ca3da9c9f8dce)

7 years agoMerge "jni: Track debuggerd API changes." am: d29f144836 am: d82212700e am: 22c8e22640
Narayan Kamath [Wed, 31 May 2017 12:40:21 +0000 (12:40 +0000)]
Merge "jni: Track debuggerd API changes." am: d29f144836 am: d82212700e am: 22c8e22640
am: 23fcf33946

Change-Id: I6f8bd889be61ce656b5f9f85c6aa8bb050ffffbc

7 years agoMerge "Fix TaskRecord wrong dump element firstActiveTime"
daqi [Wed, 31 May 2017 12:34:10 +0000 (12:34 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime"
am: 30895c5e1e

Change-Id: I5bdbbee36116fd18aa373fd666581eb274b488cb

7 years agoMerge "Change the thread for handling shutdown of PowerManagerService." into oc-dev...
Michael Wright [Wed, 31 May 2017 12:30:08 +0000 (12:30 +0000)]
Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev am: 614636e926
am: 1a66f77647

Change-Id: I9484e5763bf02e2236e40c538f0486288c3e45a4

7 years agoMerge "jni: Track debuggerd API changes." am: d29f144836 am: d82212700e
Narayan Kamath [Wed, 31 May 2017 12:29:00 +0000 (12:29 +0000)]
Merge "jni: Track debuggerd API changes." am: d29f144836 am: d82212700e
am: 22c8e22640

Change-Id: Ic2dde2f6d6dacb3420bd35b511871f41b83a54e1

7 years agoMerge "Fix TaskRecord wrong dump element firstActiveTime"
Treehugger Robot [Wed, 31 May 2017 12:25:38 +0000 (12:25 +0000)]
Merge "Fix TaskRecord wrong dump element firstActiveTime"

7 years agoMerge "Change the thread for handling shutdown of PowerManagerService." into oc-dev
Michael Wright [Wed, 31 May 2017 12:22:39 +0000 (12:22 +0000)]
Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev
am: 614636e926

Change-Id: If95c56ec0f9d1e03c8d57ae8fda81ba2696b7405

7 years agoMerge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d6...
Narayan Kamath [Wed, 31 May 2017 12:18:13 +0000 (12:18 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d645c am: 9765d78f69 am: 6f3dd693b1
am: 70dd7db6a1

Change-Id: I5840297264c8e7d3b460497dcca05cf2591c5df9

7 years agoMerge "jni: Track debuggerd API changes." am: d29f144836
Narayan Kamath [Wed, 31 May 2017 12:16:10 +0000 (12:16 +0000)]
Merge "jni: Track debuggerd API changes." am: d29f144836
am: d82212700e

Change-Id: I3022cc84acaff4a416eb070d98a2d972a0833f08

7 years agoMerge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d6...
Narayan Kamath [Wed, 31 May 2017 12:10:13 +0000 (12:10 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d645c am: 9765d78f69
am: 6f3dd693b1

Change-Id: If51d4b56f37d0b2626e5a421848e2fc954d29c44

7 years agoMerge "jni: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 12:06:35 +0000 (12:06 +0000)]
Merge "jni: Track debuggerd API changes."
am: d29f144836

Change-Id: I0a538cdcb94c2f79c371df0c60af1e1234279f5b

7 years agoMerge "Change the thread for handling shutdown of PowerManagerService." into oc-dev
TreeHugger Robot [Wed, 31 May 2017 12:06:18 +0000 (12:06 +0000)]
Merge "Change the thread for handling shutdown of PowerManagerService." into oc-dev

7 years agoMerge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d645c
Narayan Kamath [Wed, 31 May 2017 12:01:07 +0000 (12:01 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps." am: 41f23d645c
am: 9765d78f69

Change-Id: I6b5830ad5a5eda8ad2b84a1c5fa71f2beab27a88

7 years agoMerge "jni: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "jni: Track debuggerd API changes."

7 years agoMerge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
Narayan Kamath [Wed, 31 May 2017 11:52:39 +0000 (11:52 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
am: 41f23d645c

Change-Id: I900bf1adcb6bf449f6db49a34ce5a9bb26af6001

7 years agoMerge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."
Treehugger Robot [Wed, 31 May 2017 11:42:26 +0000 (11:42 +0000)]
Merge "AndroidRuntime: Add flag to support tombstoned aided stack dumps."

7 years agojni: Track debuggerd API changes.
Narayan Kamath [Thu, 25 May 2017 14:44:51 +0000 (15:44 +0100)]
jni: Track debuggerd API changes.

android_os_Debug calls dump_backtrace_to_file_timeout which
now needs an additional argument that specifies the dump type.

Bug: 32064548
Test: make

Change-Id: Ic4047f4117fee0829d4cb8b1d47ad688b33001dc

7 years agoAndroidRuntime: Add flag to support tombstoned aided stack dumps.
Narayan Kamath [Wed, 10 May 2017 17:56:12 +0000 (18:56 +0100)]
AndroidRuntime: Add flag to support tombstoned aided stack dumps.

We introduce a new property dalvik.vm.stack-trace-dir that indicates
that we're using one trace file per dump. The runtime does not need
to know what the directory is, since it will communicate with
tombstoned in order to obtain a file descriptor to which it will write
its traces. In this change, we set the -Xtombstonedtraces flag whenever
dalvik.vm.stack-trace-dir is set.

Test: Manual
Bug: 32064548
Change-Id: I05984e91658250ad8379b821ca31649f13868580

7 years agoFix race condition in NsdManagerTest
Hugo Benichi [Wed, 31 May 2017 06:31:59 +0000 (15:31 +0900)]
Fix race condition in NsdManagerTest

NsdManagerTest relies on the lastMessage variable to assert the
connection of a client to the service. The asserts in test are done on a
different thread, although the variable was not qualified volatile,
which creates the chance to read a stale value. This patch fixes this
race by marking the variable volatile.

Bug: 32561414
Bug: 62044295
Test: NsdManagerTest works
Change-Id: I0bc2cd8059c6ff8b78a2dda0ba8d6bc7e13ef951

7 years agoMerge "Credential FRP: Add implementation"
Adrian Roos [Wed, 31 May 2017 04:33:33 +0000 (04:33 +0000)]
Merge "Credential FRP: Add implementation"

7 years agoMerge "Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor....
Wale Ogunwale [Wed, 31 May 2017 04:22:18 +0000 (04:22 +0000)]
Merge "Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev am: c6700cac67" into oc-dev-plus-aosp
am: 788e9bbb25

Change-Id: Iee76e75331358802cd8d1df14304748ad5066b6c

7 years agoMerge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5...
Hugo Benichi [Wed, 31 May 2017 04:20:16 +0000 (04:20 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614 am: 7bbdfcd8eb
am: 913d39aafe

Change-Id: I78cfc9306ae8c240f10e991a5de51d09237257af

7 years agoConsistent "low storage" behavior.
Jeff Sharkey [Fri, 26 May 2017 19:10:46 +0000 (13:10 -0600)]
Consistent "low storage" behavior.

When answering the question "how much space is free", use the same
logic for Settings UI and StorageManager.getAllocatableBytes().  That
is, the reported free space is usable bytes plus any cached data the
system is willing to delete automatically.

This does *not* include any reserved cache space, since we don't want
abusive apps to penalize other well-behaved apps that are storing
their data in cache locations.  Callers freeing cached data need to
now explicitly request defiance of the reserved cache space.  (Most
callers are already doing this by using FLAG_ALLOCATE_AGGRESSIVE.)

Rewrite the core logic of DeviceStorageMonitorService to understand
this new "reserved" cache space, and to be easier to understand.  It
also now handles cached data on adopted storage volumes, which had
been ignored until now.  Also fix bug where we had skipped "low"
broadcasts when the device skipped directly from/to "full" state.

Bug: 38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Icbdcf3b52775f7ada1ceaeff2f96094c8d8052f9

7 years agoMerge "Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor....
Android Build Merger (Role) [Wed, 31 May 2017 04:11:51 +0000 (04:11 +0000)]
Merge "Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev am: c6700cac67" into oc-dev-plus-aosp

7 years agoMerge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev
Wale Ogunwale [Wed, 31 May 2017 04:11:09 +0000 (04:11 +0000)]
Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev
am: c6700cac67

Change-Id: I3348e1eaefa0107bee5fa6e3fcc94fe4eb7dd8c3

7 years agoMerge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5...
Hugo Benichi [Wed, 31 May 2017 04:10:03 +0000 (04:10 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614
am: 7bbdfcd8eb

Change-Id: I96c39ca1899768d039a108426fb04655aaf8d55f

7 years agoMerge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5
Hugo Benichi [Wed, 31 May 2017 03:59:41 +0000 (03:59 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5
am: 5f046cb614

Change-Id: I4bf83bb6b874a6ab82a6dd54228758d204120acc

7 years agoPrune unused static libs and instant apps if space needed am: f36d53cbfc
Svet Ganov [Wed, 31 May 2017 03:59:35 +0000 (03:59 +0000)]
Prune unused static libs and instant apps if space needed am: f36d53cbfc
am: a8505b5448

Change-Id: I27762e5bf5141f7cc14a43163e67fcef13785419

7 years agoMerge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev
TreeHugger Robot [Wed, 31 May 2017 03:54:51 +0000 (03:54 +0000)]
Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev

7 years agoPrune unused static libs and instant apps if space needed
Svet Ganov [Wed, 31 May 2017 03:52:16 +0000 (03:52 +0000)]
Prune unused static libs and instant apps if space needed
am: f36d53cbfc

Change-Id: I0fdca2a5069b6f3572a9cb5fe0d3ead0442b7b46

7 years agoMerge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
Hugo Benichi [Wed, 31 May 2017 03:52:05 +0000 (03:52 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
am: 76efbb30f5

Change-Id: I2c7e714af44c31a101fd58be6ebcc540fffd65a1

7 years agoMerge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"
Treehugger Robot [Wed, 31 May 2017 03:43:37 +0000 (03:43 +0000)]
Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"

7 years agoMerge "AmbientIndication: Move into container"
TreeHugger Robot [Wed, 31 May 2017 02:50:20 +0000 (02:50 +0000)]
Merge "AmbientIndication: Move into container"

7 years agoMerge "Do not set the divider pos during adjust ime and minimized interaction" into...
Matthew Ng [Wed, 31 May 2017 02:43:06 +0000 (02:43 +0000)]
Merge "Do not set the divider pos during adjust ime and minimized interaction" into oc-dev am: ddd5458092
am: 41134f388c

Change-Id: I11217345d83ac0cb9c1b61ed84a08d8e136b30e0

7 years agoMerge "Do not set the divider pos during adjust ime and minimized interaction" into...
Matthew Ng [Wed, 31 May 2017 02:35:02 +0000 (02:35 +0000)]
Merge "Do not set the divider pos during adjust ime and minimized interaction" into oc-dev
am: ddd5458092

Change-Id: I0f4c67f4c960037adc6b222018b30614892a89df

7 years agoPrune unused static libs and instant apps if space needed
Svet Ganov [Wed, 24 May 2017 07:27:21 +0000 (00:27 -0700)]
Prune unused static libs and instant apps if space needed

We are caching unused static shared libs and instant apps
(installed and uninstalled) opportunistically. If space is
needed we delete these to free up space.

Test: manual

bug:62045000

Change-Id: Id992dee5c7c6e36b8e8b81050602dbc4eeafb0f9

7 years agoMerge "Do not set the divider pos during adjust ime and minimized interaction" into...
TreeHugger Robot [Wed, 31 May 2017 02:22:27 +0000 (02:22 +0000)]
Merge "Do not set the divider pos during adjust ime and minimized interaction" into oc-dev

7 years agoCredential FRP: Add implementation
Adrian Roos [Fri, 31 Mar 2017 21:14:53 +0000 (14:14 -0700)]
Credential FRP: Add implementation

- Adds a facility to store a credential handle that survives factory reset
- Adds a method to KeyguardManager for verifying the stored credential for SetupWizard
- Dark launches persisting the primary user's credential as the FRP credential (behind a default-off flag)

Future work:
- Use a separate GK handle / synthetic password for the FRP credential
- Enroll the FRP credential in verifyCredential for the upgrade case

Bug: 36814845
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/LockPatternUtilsTest.java && runtest -x services/tests/servicestests/src/com/android/server/LockSettingsStorageTests.java && runtest -x services/tests/servicestests/src/com/android/server/SyntheticPasswordTests.java
Change-Id: Ia739408c5ecb169e5f09670cd9ceaa7febc2b1cc

7 years agoMerge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982...
Colin Cross [Wed, 31 May 2017 01:46:12 +0000 (01:46 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982eb5dd am: aa92f80288 am: 2aa649593b
am: 58dc4c8dcd

Change-Id: I579b6cfb6edec74da4149f1cf9cee9a061802ff8

7 years agoMerge "Turn off logspam (misc frameworks/base stuff)"
TreeHugger Robot [Wed, 31 May 2017 01:44:06 +0000 (01:44 +0000)]
Merge "Turn off logspam (misc frameworks/base stuff)"

7 years agoMerge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982...
Colin Cross [Wed, 31 May 2017 01:37:26 +0000 (01:37 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982eb5dd am: aa92f80288
am: 2aa649593b

Change-Id: Ie28b57bd8ed157a7a34a5224bf3f52d7818b6205

7 years agoFix unnecessary relaunches when unlocking with fingerprint sensor.
Wale Ogunwale [Wed, 24 May 2017 22:14:42 +0000 (15:14 -0700)]
Fix unnecessary relaunches when unlocking with fingerprint sensor.

When the device is unlocked using the fingerprint sensor in an
orientation opposite to the lockscreen orientation, the app that
will be visible is first relaunched in the current lockscreen
orientation and then later relaunched in the correct orientation.
If the keygaurd is going away then:
- Don't let keyguard affect device orientation. We want to use the
orientation of the app that will be visible.
- Allow the rotation sensor to be enabled even though draw isn't
complete so window manager can get the updated or last rotation
reading.
- Don't clear the previous proposed sensor reading to allow
window manager to use the information to update the orientation as
needed vs. falling back to the previous orientation.

Change-Id: I8369723d6a77f2c602f1ef080371fa7cd9ee094e
Fixes: 38494778
Test: Launch an app that doesn't fix orientation like clock, hold
the device in landscape, press the power button, unlock the device
using the fingerprint sensor, and verify the the app isn't
relaunched.

7 years agoMerge "Turn off logspam" into oc-dev am: 6fb15ea9d4
Joe Onorato [Wed, 31 May 2017 01:33:25 +0000 (01:33 +0000)]
Merge "Turn off logspam" into oc-dev am: 6fb15ea9d4
am: 541f9cf576

Change-Id: Ib2846b83d6775c124f1b2dc1ca1b4a496bc14446

7 years agoMerge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982...
Colin Cross [Wed, 31 May 2017 01:29:57 +0000 (01:29 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982eb5dd
am: aa92f80288

Change-Id: I73efdce859b040eb7e74fa50a96102b5b8a2c3f7

7 years agoMerge "Added video calling data usage per-uid support"
Jack Yu [Wed, 31 May 2017 01:29:16 +0000 (01:29 +0000)]
Merge "Added video calling data usage per-uid support"

7 years agoMerge "Create fonts.xml module for adding fonts.xml to system/etc"
TreeHugger Robot [Wed, 31 May 2017 01:28:55 +0000 (01:28 +0000)]
Merge "Create fonts.xml module for adding fonts.xml to system/etc"

7 years agoMerge "Turn off logspam" into oc-dev
Joe Onorato [Wed, 31 May 2017 01:25:55 +0000 (01:25 +0000)]
Merge "Turn off logspam" into oc-dev
am: 6fb15ea9d4

Change-Id: I975c93d9f110a8a1488e366180da727ad9ec6408

7 years agoConnectivityServiceTest: more tweaks to testRequestBenchmark
Hugo Benichi [Mon, 29 May 2017 04:13:52 +0000 (13:13 +0900)]
ConnectivityServiceTest: more tweaks to testRequestBenchmark

Recent continuous testing runs indicates that commit 849b81b7 did not
completely fixed the issue with testRequestBenchmark.

This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.

In addition timeouts are adjusted to take into account recent failures
observed.

This is the last pending action before turning on FrameworksNetTests on
presubmits.

Bug: 32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb

7 years agoMerge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
Colin Cross [Wed, 31 May 2017 01:22:00 +0000 (01:22 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
am: a4982eb5dd

Change-Id: Ic7700b1974d2d3aa3df0c55003ee6c16c1ba6ece

7 years agoMerge changes I4b58610f,Ib758756a into oc-dev am: a9873bc8f6
Joe Onorato [Wed, 31 May 2017 01:21:59 +0000 (01:21 +0000)]
Merge changes I4b58610f,Ib758756a into oc-dev am: a9873bc8f6
am: b3b191e340

Change-Id: Iaa1837d9da020b848e79c74962589c67c6598ac4

7 years agoMerge "Turn off logspam" into oc-dev
Joe Onorato [Wed, 31 May 2017 01:18:01 +0000 (01:18 +0000)]
Merge "Turn off logspam" into oc-dev

7 years agoMerge changes I4b58610f,Ib758756a into oc-dev
Joe Onorato [Wed, 31 May 2017 01:14:54 +0000 (01:14 +0000)]
Merge changes I4b58610f,Ib758756a into oc-dev
am: a9873bc8f6

Change-Id: I07b352ee11492718ee2abb76d48937f39f17125c

7 years agoMerge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
Treehugger Robot [Wed, 31 May 2017 01:13:05 +0000 (01:13 +0000)]
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"

7 years agoMerge changes I4b58610f,Ib758756a into oc-dev
TreeHugger Robot [Wed, 31 May 2017 01:07:21 +0000 (01:07 +0000)]
Merge changes I4b58610f,Ib758756a into oc-dev

* changes:
  Turn off the check in the test because the assertion is off in the implementation.
  Fix typos that cause infinite recursion and CTS test failure.

7 years agoMerge "Compare against correct user id to determine static lib clients" into oc-dev...
Svet Ganov [Wed, 31 May 2017 01:06:28 +0000 (01:06 +0000)]
Merge "Compare against correct user id to determine static lib clients" into oc-dev am: 13eef357d6
am: 962b4ad29c

Change-Id: I101d2b0876445f09f881e90940401ca3847f2475

7 years agoMerge "Compare against correct user id to determine static lib clients" into oc-dev
Svet Ganov [Wed, 31 May 2017 00:58:25 +0000 (00:58 +0000)]
Merge "Compare against correct user id to determine static lib clients" into oc-dev
am: 13eef357d6

Change-Id: I94d6ec64d861a687d4bda6ef900d092c3401bc03

7 years agoMerge "Compare against correct user id to determine static lib clients" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 00:52:38 +0000 (00:52 +0000)]
Merge "Compare against correct user id to determine static lib clients" into oc-dev

7 years agoAmbientIndication: Move into container
Adrian Roos [Fri, 26 May 2017 01:03:58 +0000 (18:03 -0700)]
AmbientIndication: Move into container

This allows fixing the following bugs:
- ambient indication should be hidden outside keyguard
- ambient indication should animate with the unlock hint
- ambient indication should fade out when unlocking

Fixes: 38289189
Test: observe that the things above are working correctly
Change-Id: I34aff69bb5621a3f12c25e87eac6a89c8c7e2165

7 years agoMerge "Make NFC AIDL callbacks oneway" into oc-dev am: 1573489991
Ruchi Kandoi [Wed, 31 May 2017 00:41:12 +0000 (00:41 +0000)]
Merge "Make NFC AIDL callbacks oneway" into oc-dev am: 1573489991
am: e053d21d06

Change-Id: I897b6d9a6b830b1100b95423b43b11b2ed0a766c

7 years agoMerge "Fix issue #62196301: Pre-O background restrictions allow starts..." into oc...
Dianne Hackborn [Wed, 31 May 2017 00:36:40 +0000 (00:36 +0000)]
Merge "Fix issue #62196301: Pre-O background restrictions allow starts..." into oc-dev am: 952d68fa85
am: 84f5455586

Change-Id: Ic6f79f8caf8f50308ef7e0763fa2fe53765a0cb9

7 years agoMerge "Fix issue with aspect ratio not applying correctly when PIP is expanded" into...
Winson Chung [Wed, 31 May 2017 00:34:22 +0000 (00:34 +0000)]
Merge "Fix issue with aspect ratio not applying correctly when PIP is expanded" into oc-dev am: 9c1b222fc1
am: e322d120cc

Change-Id: Ife88f1db852d49c31ddbbd5a6ebbe55f4ae02f51

7 years agoMerge "Make NFC AIDL callbacks oneway" into oc-dev
Ruchi Kandoi [Wed, 31 May 2017 00:33:01 +0000 (00:33 +0000)]
Merge "Make NFC AIDL callbacks oneway" into oc-dev
am: 1573489991

Change-Id: Ie0e8471a3998bdb2fefde6c67823b71a889e0d81

7 years agoMerge "Fix NPE and wrong behavior of Typeface.isSupportedAxes" into oc-dev am: 633b32be55
Seigo Nonaka [Wed, 31 May 2017 00:27:12 +0000 (00:27 +0000)]
Merge "Fix NPE and wrong behavior of Typeface.isSupportedAxes" into oc-dev am: 633b32be55
am: bc790383d2

Change-Id: Ie308baed43bf39394949e2fa9fc1ebab1dc98e65