OSDN Git Service

android-x86/frameworks-base.git
7 years agoHandle content insets for snapshots
Jorim Jaggi [Thu, 29 Dec 2016 13:57:22 +0000 (14:57 +0100)]
Handle content insets for snapshots

Pass information about content insets of a snapshotted task to
SystemUI and use it there to correctly offset the snapshot
when drawing.

Test: Open app, go to recents, make sure app aligns before
and after the animation.
Bug: 31339431
Change-Id: I2ff9bd44534bd8f66b591385da1e1e3aec40b6c5

7 years agoAlways remove starting window in performShow
Jorim Jaggi [Thu, 29 Dec 2016 10:51:42 +0000 (11:51 +0100)]
Always remove starting window in performShow

When going to homescreen and then opening apps quickly again, the
surface was not yet fully destroyed so we never triggered the
codepath to remove the starting window in that case, so it was
lingering around forever.

Test: Open app, press home, reopen app immidiately again, make sure
snapshot starting window is removed.
Bug: 31339431
Change-Id: I946e681e7dc222e3dedfd3edacb8f37aee4a198b

7 years agoInitial implementation of snapshots
Jorim Jaggi [Tue, 6 Dec 2016 17:10:06 +0000 (09:10 -0800)]
Initial implementation of snapshots

All this functionality is hidden behind a flag. If this flag is
active, we disable the regular screenshots.

Instead, we take a screenshot when an app transition for which a
task is disappearing is starting. The screenshot gets stored
into a gralloc buffer. SystemUI uses a new method to retrieve
a snapshot gralloc buffer and then draws it using GraphicBuffer.
createHardwareBitmap().

When starting an existing activity in an existing tasks, or when
bringing an existing tasks to front from recents, we add a new
snapshot starting window. For that, we reuse the existing
starting window, but when creating the window, we use a fake
window that draws the contents of the starting window.

Test: runtest frameworks-services -c
com.android.server.wm.TaskSnapshotControllerTest
Bug: 31339431
Change-Id: If72df07b3e56f30413db5029d0887b8c9665aaf4

7 years agoMerge "Fix NPE when trying to add starting window"
TreeHugger Robot [Thu, 12 Jan 2017 15:01:49 +0000 (15:01 +0000)]
Merge "Fix NPE when trying to add starting window"

7 years agoMerge "Remove PO support from HardwarePropertiesManager"
TreeHugger Robot [Thu, 12 Jan 2017 14:01:22 +0000 (14:01 +0000)]
Merge "Remove PO support from HardwarePropertiesManager"

7 years agoMerge "[DPM] Allow lower strong auth timeout on debuggable builds"
TreeHugger Robot [Thu, 12 Jan 2017 13:46:05 +0000 (13:46 +0000)]
Merge "[DPM] Allow lower strong auth timeout on debuggable builds"

7 years agoFix NPE when trying to add starting window
Jorim Jaggi [Thu, 12 Jan 2017 12:54:40 +0000 (13:54 +0100)]
Fix NPE when trying to add starting window

Container may already have been removed, so protect against that
situation.

Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes: 34227241

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a...
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2 am: 95322ffdde
am: 4103219402

Change-Id: Iadadfa8f8be5539fffa27c89ab7ebb74ada694e4

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a...
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:39:05 +0000 (11:39 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2
am: 95322ffdde

Change-Id: Ibc624034478689ad1208e5da15835a6acd2d796a

7 years ago[DPM] Allow lower strong auth timeout on debuggable builds
Michal Karpinski [Wed, 14 Dec 2016 13:47:37 +0000 (13:47 +0000)]
[DPM] Allow lower strong auth timeout on debuggable builds

Timeout can be set to lower than 1h on debuggable builds (eng, user-debug)
using persist.sys.min_str_auth_timeo system property. This allows manual
testers to more easily carry out testing scenarios.

Bug: 29825955
Test: manual without setting the property: if timeout is set to less than 1h, it's clamped to 1h
Test: manual with setting the property: on user-debug build with "adb root && adb shell setprop persist.sys.min_str_auth_timeo 30000"
Change-Id: I8cd871e3d04b2c6c7164f684b9a6a24e7292bfab

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:33:15 +0000 (11:33 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a
am: 3556fd53a2

Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
am: c0d71fa38a

Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901

7 years agoMerge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"

7 years agoMerge "Modify WifiNetworkScoreCache to print full Score."
TreeHugger Robot [Thu, 12 Jan 2017 11:13:33 +0000 (11:13 +0000)]
Merge "Modify WifiNetworkScoreCache to print full Score."

7 years agoMerge "Let profile owners also receive OTA notification."
Pavel Grafov [Thu, 12 Jan 2017 11:11:57 +0000 (11:11 +0000)]
Merge "Let profile owners also receive OTA notification."

7 years agoMerge "Fix DevicePolicyManagerServiceMigrationTest."
Pavel Grafov [Thu, 12 Jan 2017 11:08:50 +0000 (11:08 +0000)]
Merge "Fix DevicePolicyManagerServiceMigrationTest."

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b3...
Erik Kline [Thu, 12 Jan 2017 10:49:31 +0000 (10:49 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 am: 082263344a
am: 190d8591ce

Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109

7 years agoMerge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 am: eed50c1809
Martijn Coenen [Thu, 12 Jan 2017 10:44:38 +0000 (10:44 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 am: eed50c1809
am: cfc4e21899

Change-Id: I0478ca20b670f7ddd776ea98f3d5d1db928842ac

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
Erik Kline [Thu, 12 Jan 2017 10:43:26 +0000 (10:43 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a

7 years agoMerge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9
Martijn Coenen [Thu, 12 Jan 2017 10:38:28 +0000 (10:38 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9
am: eed50c1809

Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b
Erik Kline [Thu, 12 Jan 2017 10:33:24 +0000 (10:33 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b
am: cbd3d8b356

Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0

7 years agoMerge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling"
Erik Kline [Thu, 12 Jan 2017 10:26:43 +0000 (10:26 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9

7 years agoMerge "Use new read(Embedded)Buffer APIs."
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am: 34ed84d4eb

Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b

7 years agoMerge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"

7 years agoMerge "Use new read(Embedded)Buffer APIs."
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."

7 years agoModify WifiNetworkScoreCache to print full Score.
Sundeep Ghuman [Thu, 12 Jan 2017 00:54:08 +0000 (16:54 -0800)]
Modify WifiNetworkScoreCache to print full Score.

Test: dumped network_score and verified printout
Change-Id: I3689449db91e8c5e96bed349749f074c5626bd03

7 years agoTrack libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d

java.util.regex named group capture support.

Test: vogar OldMatcherTest
Bug: 19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29

7 years agoMerge "Captive portal: better detect empty responses" into nyc-mr2-dev am: c45082266f
Hugo Benichi [Thu, 12 Jan 2017 09:06:28 +0000 (09:06 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev am: c45082266f
am: f32a9f72d0

Change-Id: I62c0ab068b1304a1dbe7edbae29e5e74d8c34e08

7 years agoCaptive portal: better detect empty responses am: cb4aa4d412
Hugo Benichi [Thu, 12 Jan 2017 09:05:25 +0000 (09:05 +0000)]
Captive portal: better detect empty responses am: cb4aa4d412
am: 3d5357ba2d

Change-Id: I3982ce4485d94c4abcf6afb2c58aa94a2ff2c902

7 years agoMerge "Captive portal: better detect empty responses" into nyc-mr2-dev
Hugo Benichi [Thu, 12 Jan 2017 08:59:33 +0000 (08:59 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
am: c45082266f

Change-Id: Ice8b5df87baf475ebc4eb8f2eb4fe0150c938639

7 years agoCaptive portal: better detect empty responses
Hugo Benichi [Thu, 12 Jan 2017 08:59:27 +0000 (08:59 +0000)]
Captive portal: better detect empty responses
am: cb4aa4d412

Change-Id: I64a006f6bb83dc588b108395d54189bb401c83ff

7 years agoMerge "Captive portal: better detect empty responses" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 08:51:31 +0000 (08:51 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev

7 years agoMerge "Follow minikin::FontFamily constructor signature change."
TreeHugger Robot [Thu, 12 Jan 2017 07:43:49 +0000 (07:43 +0000)]
Merge "Follow minikin::FontFamily constructor signature change."

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366...
Stephen Chen [Thu, 12 Jan 2017 07:39:50 +0000 (07:39 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac am: 272e70bf69
am: 50b0979972  -s ours

Change-Id: I6c96fa4a4033be5236f00082e3c7000a7061dbe9

7 years agoMerge "Add networkrecommendation permissions to privapp perms list."
TreeHugger Robot [Thu, 12 Jan 2017 07:33:44 +0000 (07:33 +0000)]
Merge "Add networkrecommendation permissions to privapp perms list."

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366...
Stephen Chen [Thu, 12 Jan 2017 07:33:19 +0000 (07:33 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac
am: 272e70bf69

Change-Id: I2bc76076e613566111404c55faefaeda9048f2d1

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366
am: 0e7882f2ac

Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am: 691ebe5366

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"

7 years agoCaptive portal: better detect empty responses
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses

The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.

However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.

When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.

This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.

Test: build, flashed + manual tests.
Bug: 33498325
Change-Id: Ie2e5c6a9dc3740e4a2304034879b5ed60f277ade

7 years agoMerge "Check the count of the families in a default collection."
Seigo Nonaka [Thu, 12 Jan 2017 06:02:55 +0000 (06:02 +0000)]
Merge "Check the count of the families in a default collection."

7 years agoExpose WifiManager#connect and ActionListener as @SystemApi
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi

This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8

7 years agoMerge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15
Colin Cross [Thu, 12 Jan 2017 05:16:47 +0000 (05:16 +0000)]
Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15
am: 9d273bfec1  -s ours

Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e

7 years agoMerge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43
Colin Cross [Thu, 12 Jan 2017 05:11:47 +0000 (05:11 +0000)]
Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43
am: dcb0c55c15

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c

7 years agoMerge "Converting action bars to clusters."
TreeHugger Robot [Thu, 12 Jan 2017 05:11:23 +0000 (05:11 +0000)]
Merge "Converting action bars to clusters."

7 years agoMerge "Remove libservicestestsjni" am: d00478e9ad
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am: d00478e9ad
am: 301c714b43

Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12

7 years agoMerge "Remove libservicestestsjni"
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c

7 years agoMerge "Rename language+country resources to just language"
Roozbeh Pournader [Thu, 12 Jan 2017 04:58:07 +0000 (04:58 +0000)]
Merge "Rename language+country resources to just language"

7 years agoAdd networkrecommendation permissions to privapp perms list.
Joe LaPenna [Thu, 12 Jan 2017 04:54:03 +0000 (20:54 -0800)]
Add networkrecommendation permissions to privapp perms list.

Bug: 34235587
Test: Flashed and checked logcat for crash.
Change-Id: Ib35070ea87e23a3be8804eb3796e02c76a5628d0

7 years agoMerge "Remove libservicestestsjni"
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"

7 years agoSimplify UpstreamNetworkMonitor callback handling
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling

In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1

7 years agoMerge "API for setting default focus per cluster."
TreeHugger Robot [Thu, 12 Jan 2017 04:19:13 +0000 (04:19 +0000)]
Merge "API for setting default focus per cluster."

7 years agoRemove libservicestestsjni
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni

frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065

7 years agoMerge "Sync the startConsentUiIfNeeded logics to master. We are missing the package...
Shijian Li [Thu, 12 Jan 2017 03:19:33 +0000 (03:19 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp
am: 8ec5d822c1

Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:19:25 +0000 (03:19 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59
am: f8d62ca359

Change-Id: I4c4130790fbfc56cb952fc076fd2be611bf51b1f

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:18:09 +0000 (03:18 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: 699e7878ef
am: 7eed086b86

Change-Id: I33321847b4e945498bf4ca4c9840605cd9d31947

7 years agoMerge "Sync the startConsentUiIfNeeded logics to master. We are missing the package...
Android Build Merger (Role) [Thu, 12 Jan 2017 03:13:04 +0000 (03:13 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: ae21066a59

Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now. am: 5e7fc7ccc8
am: 699e7878ef

Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I327673625deafc5c18319ce1b61734a090b6a989

7 years agoSync the startConsentUiIfNeeded logics to master. We are missing the package name...
Shijian Li [Thu, 12 Jan 2017 03:07:10 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to  We are missing the package name when starting the activity now.
am: 5e7fc7ccc8

Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf

7 years agoMerge "Remove libservicestestsjni"
TreeHugger Robot [Thu, 12 Jan 2017 02:55:12 +0000 (02:55 +0000)]
Merge "Remove libservicestestsjni"

7 years agoMerge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d am: 860ef8810d
Yifan Hong [Thu, 12 Jan 2017 02:20:03 +0000 (02:20 +0000)]
Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d am: 860ef8810d
am: be7a9b89f4

Change-Id: Iac121abc1603f4739a61b8efc6ce7361656d16ba

7 years agoMerge "add additional logging to ActiityManagerService" into nyc-mr2-dev am: 0b7b79a882
Tim Murray [Thu, 12 Jan 2017 02:14:18 +0000 (02:14 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am: 0b7b79a882
am: d8ecc93ca0

Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841

7 years agoMerge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
Yifan Hong [Thu, 12 Jan 2017 02:14:00 +0000 (02:14 +0000)]
Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
am: 860ef8810d

Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32

7 years agoMerge "BpBase -> BpHwBase" am: d8384b5c15
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am: d8384b5c15
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e

7 years agoMerge "BpBase -> BpHwBase"
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am: d8384b5c15

Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4

7 years agoMerge "BpBase -> BpHwBase"
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"

7 years agoConverting action bars to clusters.
Vadim Tryshev [Sat, 7 Jan 2017 03:30:00 +0000 (19:30 -0800)]
Converting action bars to clusters.

ActionBar keyboard navigation logic is now implemented via clusters.
Old implementation using setTouchscreenBlocksFocus and Ctrl+Shift+<
shortcut is removed.

Looking at the code, I can’t rule out existence of all 3 categories
(1) action bars with a nested toolbar, (2) action bars without a
nested toolbar and (3) Toolbars outside of action bars.
Because of this, I set “cluster” attribute both on action bar and
toolbar, and have code to avoid nested clusters in case (1).

Support lib’s action/tool bars aren’t converted, however, they
didn’t regress since Ctrl+Shift+< never worked for them. Will be
done after feature freeze.

Bug: 32151632
Test: Manual checks.
Change-Id: Ieb93980088c0fb385a9bc8a5d218ffc269b94dc5

7 years agoresolve merge conflicts of 8d7b18292b63 to master
Tim Murray [Thu, 12 Jan 2017 01:13:44 +0000 (17:13 -0800)]
resolve merge conflicts of 8d7b18292b63 to master

Change-Id: Id59ab691bfdb98cff179dfa23e3ddb185e646f53

7 years agoAPI for setting default focus per cluster.
Vadim Tryshev [Thu, 5 Jan 2017 01:24:43 +0000 (17:24 -0800)]
API for setting default focus per cluster.

UX spec requires us to allow apps to specify default focus per
cluster.

This change introduces a boolean attribute for Views to do so.

API is designed for cases when the view hierarchy is inflated,
manually constructed, as well as for hybrid scenarios.

The implementation piggybacks the recently introduced logic for
saving/restoring last focus in a cluster. To accommodate new needs,
the focus-saving were rename-generalized in this CL.

Bug: 32151632
Test: Manual checks; CTS are coming after feature freeze.
Change-Id: Ia92600c3a886db9a0d4df9dd9fd0e3479e68e7a4

7 years agoMerge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Tim Murray [Thu, 12 Jan 2017 00:32:01 +0000 (00:32 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
am: 0b7b79a882

Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c

7 years agoadd additional logging to ActiityManagerService
Tim Murray [Thu, 12 Jan 2017 00:31:54 +0000 (00:31 +0000)]
add additional logging to ActiityManagerService
am: 82e201f03d

Change-Id: I0ea737adc3f59674a0ce313a0a8caa49d926e359

7 years agoMerge "Fix some issues with the last used entry"
Hakan Seyalioglu [Thu, 12 Jan 2017 00:26:59 +0000 (00:26 +0000)]
Merge "Fix some issues with the last used entry"

7 years agoMerge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Tim Murray [Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev

7 years agoRemove libservicestestsjni
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni

frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065

7 years agoMerge "Do not report boot timings on first boot or runtime restart"
TreeHugger Robot [Wed, 11 Jan 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Do not report boot timings on first boot or runtime restart"

7 years agoMerge "BpBase -> BpHwBase"
TreeHugger Robot [Wed, 11 Jan 2017 23:43:15 +0000 (23:43 +0000)]
Merge "BpBase -> BpHwBase"

7 years agoMerge "Don't clamp override config to screen area for freeform task"
Yorke Lee [Wed, 11 Jan 2017 23:41:52 +0000 (23:41 +0000)]
Merge "Don't clamp override config to screen area for freeform task"

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am...
Etan Cohen [Wed, 11 Jan 2017 23:28:20 +0000 (23:28 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am: b32dfa4ef5
am: 3fc5b186fa

Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
Etan Cohen [Wed, 11 Jan 2017 23:22:51 +0000 (23:22 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
am: b32dfa4ef5

Change-Id: If2a6b632cd03984921572b190745865953a8e808

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev am: 2729bb8517
Felipe Leme [Wed, 11 Jan 2017 23:18:28 +0000 (23:18 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev am: 2729bb8517
am: 2a57dd77e3  -s ours

Change-Id: I288d28b63b1123096e6d036f34edbb919d8889ff

7 years agoAdded BUGREPORT_OPTION_TELEPHONY. am: a561b1f9c0
Felipe Leme [Wed, 11 Jan 2017 23:17:22 +0000 (23:17 +0000)]
Added BUGREPORT_OPTION_TELEPHONY. am: a561b1f9c0
am: c88368c270  -s ours

Change-Id: I9f8dc4d1ef90c98a5436b044407497d9f470098d

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
Etan Cohen [Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Etan Cohen [Wed, 11 Jan 2017 23:12:16 +0000 (23:12 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
Felipe Leme [Wed, 11 Jan 2017 23:09:30 +0000 (23:09 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
am: 2729bb8517

Change-Id: Idfef7bea67e3f75bc5faad6e325c4197c4904652

7 years agoAdded BUGREPORT_OPTION_TELEPHONY.
Felipe Leme [Wed, 11 Jan 2017 23:09:01 +0000 (23:09 +0000)]
Added BUGREPORT_OPTION_TELEPHONY.
am: a561b1f9c0

Change-Id: I063a0d6c4c66035082789d4361b649439da00bf9

7 years agoMerge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
Etan Cohen [Wed, 11 Jan 2017 22:59:24 +0000 (22:59 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"

7 years agoMerge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Jan 2017 22:55:34 +0000 (22:55 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev

7 years agoMerge "Made ActivityManager.forceStopPackage a @SystemApi"
Jeff Schumacher [Wed, 11 Jan 2017 22:34:27 +0000 (22:34 +0000)]
Merge "Made ActivityManager.forceStopPackage a @SystemApi"

7 years agoDo not report boot timings on first boot or runtime restart
Fyodor Kupolov [Wed, 11 Jan 2017 02:34:10 +0000 (18:34 -0800)]
Do not report boot timings on first boot or runtime restart

During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.

The following metrics were updated:
 - boot_system_server_init - check added for consistency with other
   metrics in SystemServer. The metric is actually unaffected by first boot,
   because dexopt will start later
 - boot_package_manager_init_ready
 - boot_system_server_init
 - framework_locked_boot_completed
 - framework_boot_completed

Test: manual + UserControllerTest pass
Bug: 32807863
Change-Id: Iff13697b7d4f9ff8439e1e932d7e276f48cd5c37

7 years agoMerge "Remove unused com.android.internal.widget.Smileys class"
Aurimas Liutikas [Wed, 11 Jan 2017 22:06:03 +0000 (22:06 +0000)]
Merge "Remove unused com.android.internal.widget.Smileys class"

7 years agoMerge "Add flag and listener for a11y volume requests."
Phil Weaver [Wed, 11 Jan 2017 21:57:05 +0000 (21:57 +0000)]
Merge "Add flag and listener for a11y volume requests."

7 years agoMerge "Expose getApplicationInfo(UserHandle)"
Makoto Onuki [Wed, 11 Jan 2017 21:56:20 +0000 (21:56 +0000)]
Merge "Expose getApplicationInfo(UserHandle)"

7 years agoFix some issues with the last used entry
Hakan Seyalioglu [Sat, 7 Jan 2017 03:54:43 +0000 (19:54 -0800)]
Fix some issues with the last used entry

Delay a few operations until after the async phase which rely on display
info being retrieved for resolve targets until after they are available.

Also fix a smaller bug where the list header may be appended multiple
times on activity recreation. Wanted to submit this while writing unit
tests still in progress since there's an open P1 on this for dogfood.

bug: 341032883412885434127768
Test: Manual testing - writing unit tests in progress.
Change-Id: I47f747a7493f47863a0107cd8054901bab494462

7 years agoadd additional logging to ActiityManagerService
Tim Murray [Wed, 11 Jan 2017 17:52:38 +0000 (09:52 -0800)]
add additional logging to ActiityManagerService

add logging to help debugging issues with attachApplication/attachApplicationLocked.

bug 34193533
Tests: boots and starts apps

Change-Id: I6ef46dd92e893b71c164bfb28eeba1835dddffee

7 years agoMerge "Fix Skia merge by fixing API mismatch."
TreeHugger Robot [Wed, 11 Jan 2017 21:19:55 +0000 (21:19 +0000)]
Merge "Fix Skia merge by fixing API mismatch."

7 years agoMerge "DozeService: Fix crash if StatusBar not yet initialized"
TreeHugger Robot [Wed, 11 Jan 2017 21:19:24 +0000 (21:19 +0000)]
Merge "DozeService: Fix crash if StatusBar not yet initialized"

7 years agoMerge "@hide RetentionPolicy.SOURCE annotation"
Makoto Onuki [Wed, 11 Jan 2017 21:14:16 +0000 (21:14 +0000)]
Merge "@hide RetentionPolicy.SOURCE annotation"