OSDN Git Service

android-x86/frameworks-base.git
7 years agoFix transitions between single and multi-pane.
Filip Pavlis [Fri, 6 Jan 2017 18:15:51 +0000 (18:15 +0000)]
Fix transitions between single and multi-pane.

Transitions in and out of multi-window were causing navigation history
losses + incorrect views to be displayed. The history loss was caused by
the fact that single-pane mode was using Activities but multi-pane mode
was using Fragments. Translating history between those two would be
challenging. Because of that Fragment approach was also applied to
single-pane mode. That required some changes in back press handling and
initial logic when creating the PreferenceActivity.

Test: Separate CTS CL being submitted along this one, see the topic.
Bug: 32201932
Change-Id: I5e6a6a21c34e813d1c3522ae7f5e33f43887c602

7 years agoMerge "Expose CAMERA and ACCESS_NETWORK_STATE to ephemeral apps"
Chad Brubaker [Wed, 30 Nov 2016 18:30:45 +0000 (18:30 +0000)]
Merge "Expose CAMERA and ACCESS_NETWORK_STATE to ephemeral apps"

7 years agoMerge "Don't invalidate list data during layout." into nyc-mr2-dev am: d1b7d3262b
Phil Weaver [Wed, 30 Nov 2016 18:06:31 +0000 (18:06 +0000)]
Merge "Don't invalidate list data during layout." into nyc-mr2-dev am: d1b7d3262b
am: 762cbc339a

Change-Id: Ia500eb99d221174ecb84db2bd4a4408a92fdd5c9

7 years agoDon't invalidate list data during layout. am: a9d976f39a
Phil Weaver [Wed, 30 Nov 2016 18:05:26 +0000 (18:05 +0000)]
Don't invalidate list data during layout. am: a9d976f39a
am: 84a0d97b85

Change-Id: I0dc549674ed7e026cbe15ac6d06626305729e7b8

7 years agoMerge "Don't invalidate list data during layout." into nyc-mr2-dev
Phil Weaver [Wed, 30 Nov 2016 18:01:00 +0000 (18:01 +0000)]
Merge "Don't invalidate list data during layout." into nyc-mr2-dev
am: d1b7d3262b

Change-Id: I869cdb0da5b59bb78d75ea1af2e1f20cae54aa3d

7 years agoDon't invalidate list data during layout.
Phil Weaver [Wed, 30 Nov 2016 18:00:54 +0000 (18:00 +0000)]
Don't invalidate list data during layout.
am: a9d976f39a

Change-Id: I865fda193961bb0e5229cba1034b818572662001

7 years agoMerge "Don't invalidate list data during layout." into nyc-mr2-dev
Phil Weaver [Wed, 30 Nov 2016 17:51:37 +0000 (17:51 +0000)]
Merge "Don't invalidate list data during layout." into nyc-mr2-dev

7 years agoMerge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 475029...
Etan Cohen [Wed, 30 Nov 2016 17:30:23 +0000 (17:30 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff am: 1c92763087
am: 1f5d3014c5

Change-Id: I1f874e790b35686968f6c54f668db0cd996b6f70

7 years agoMerge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 475029...
Etan Cohen [Wed, 30 Nov 2016 17:24:47 +0000 (17:24 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff
am: 1c92763087

Change-Id: Ia0e33002b0d2b4a7e357555c15d6c285a38a2c8f

7 years agoMerge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad
Etan Cohen [Wed, 30 Nov 2016 17:14:14 +0000 (17:14 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad
am: ad299d38ff

Change-Id: I9834f0e2687685a52970ab406a411217cc2eeec9

7 years agoMerge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
Etan Cohen [Wed, 30 Nov 2016 17:08:32 +0000 (17:08 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
am: 47502919ad

Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26

7 years agoMerge "Add fallback case in glGetShaderInfoLog"
Romain Guy [Wed, 30 Nov 2016 17:05:34 +0000 (17:05 +0000)]
Merge "Add fallback case in glGetShaderInfoLog"

7 years agoMerge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
Etan Cohen [Wed, 30 Nov 2016 16:58:07 +0000 (16:58 +0000)]
Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"

7 years agoMerge "Add overdraw debugging feature to Skia pipelines"
Matt Sarett [Wed, 30 Nov 2016 16:51:21 +0000 (16:51 +0000)]
Merge "Add overdraw debugging feature to Skia pipelines"

7 years agoMerge "Update java doc to reflect EXTRA_USER"
Mahaver Chopra [Wed, 30 Nov 2016 16:27:44 +0000 (16:27 +0000)]
Merge "Update java doc to reflect EXTRA_USER"

7 years agoMerge "Adds data store to provide data abstracion layer for Preferences."
Filip Pavlis [Wed, 30 Nov 2016 16:22:58 +0000 (16:22 +0000)]
Merge "Adds data store to provide data abstracion layer for Preferences."

7 years ago[AWARE] Data-path creation roles hard-coded for discovery sessions
Etan Cohen [Wed, 16 Nov 2016 15:07:11 +0000 (07:07 -0800)]
[AWARE] Data-path creation roles hard-coded for discovery sessions

Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.

(cherry-pick of commit 9c7483fec41db681a2d6de93a9061fb8764ecba5)

Bug: 32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c

7 years agoMerge "Blocked packages can't create channels."
Julia Reynolds [Wed, 30 Nov 2016 15:09:31 +0000 (15:09 +0000)]
Merge "Blocked packages can't create channels."

7 years agoMerge "Allow apps to set vibrations pattern for channels"
Julia Reynolds [Wed, 30 Nov 2016 15:08:09 +0000 (15:08 +0000)]
Merge "Allow apps to set vibrations pattern for channels"

7 years agoMerge "Shorten log tag."
Julia Reynolds [Wed, 30 Nov 2016 15:00:50 +0000 (15:00 +0000)]
Merge "Shorten log tag."

7 years agoMerge "Stop a blink of the final position of shared element."
TreeHugger Robot [Wed, 30 Nov 2016 14:15:28 +0000 (14:15 +0000)]
Merge "Stop a blink of the final position of shared element."

7 years agoShorten log tag.
Julia Reynolds [Mon, 28 Nov 2016 18:50:22 +0000 (13:50 -0500)]
Shorten log tag.

Bug: 32437842
Test: manual
Change-Id: Id6f77a2dec30a4da695232d70e441398285f14d0

7 years agoUpdate java doc to reflect EXTRA_USER
Mahaver [Tue, 29 Nov 2016 20:52:18 +0000 (20:52 +0000)]
Update java doc to reflect EXTRA_USER

Update java doc for ACTION_MANAGED_PROFILE_PROVISIONED to reflect the
fact that the extra EXTRA_USER will contain the managed profile's
user handle.

Test: NA, Just a java doc update.
Bug: 32301911
Change-Id: Icfda56dea69353ede02ddeee88a7adb489e72d36

7 years agoMerge "Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485f...
Android Build Merger (Role) [Wed, 30 Nov 2016 13:36:09 +0000 (13:36 +0000)]
Merge "Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c am: e34370edfd  -s ours"

7 years agoMerge "Allow DO to access DevicePolicyManager.isDeviceManaged()"
TreeHugger Robot [Wed, 30 Nov 2016 13:35:33 +0000 (13:35 +0000)]
Merge "Allow DO to access DevicePolicyManager.isDeviceManaged()"

7 years agoMerge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce...
Paul Duffin [Wed, 30 Nov 2016 13:35:15 +0000 (13:35 +0000)]
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c
am: e34370edfd  -s ours

Change-Id: I0a06fd6b8c7c9c860ecf293728c1c0d887b82358

7 years agoStop a blink of the final position of shared element.
George Mount [Wed, 30 Nov 2016 13:11:52 +0000 (05:11 -0800)]
Stop a blink of the final position of shared element.

Sometimes a frame from the final layout position of the shared
element was showing on the first frame of the activity showing.
This pushes the first frame to force it until after the transition
has started.

Test: manual testing

Change-Id: I831ed4b419eaadf1aad9d5efbeb99f04eebd0640

7 years agoMerge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce
Paul Duffin [Wed, 30 Nov 2016 12:25:47 +0000 (12:25 +0000)]
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce
am: 783096f02c

Change-Id: I6fc52a2935575149766f681902e8d8dd62f715f8

7 years agoMerge "Add legacy-test as replacement for core-junit" am: e75a82a92f
Paul Duffin [Wed, 30 Nov 2016 12:20:11 +0000 (12:20 +0000)]
Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f
am: a485fa1fce

Change-Id: I578b109bc0a4f8655643dad1092b46296ff18114

7 years agoMerge "Add legacy-test as replacement for core-junit"
Paul Duffin [Wed, 30 Nov 2016 12:15:14 +0000 (12:15 +0000)]
Merge "Add legacy-test as replacement for core-junit"
am: e75a82a92f

Change-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6

7 years agoMerge "Add legacy-test as replacement for core-junit"
Paul Duffin [Wed, 30 Nov 2016 12:04:23 +0000 (12:04 +0000)]
Merge "Add legacy-test as replacement for core-junit"

7 years agoMerge "Add legacy-test as replacement for core-junit"
Paul Duffin [Wed, 30 Nov 2016 11:59:58 +0000 (11:59 +0000)]
Merge "Add legacy-test as replacement for core-junit"

7 years agoMerge "AutoSize TextView (part 2) - benchmark number of sizes"
Andrei Stingaceanu [Wed, 30 Nov 2016 11:02:50 +0000 (11:02 +0000)]
Merge "AutoSize TextView (part 2) - benchmark number of sizes"

7 years agoAllow DO to access DevicePolicyManager.isDeviceManaged()
Bartosz Fabianowski [Wed, 30 Nov 2016 10:09:22 +0000 (11:09 +0100)]
Allow DO to access DevicePolicyManager.isDeviceManaged()

This CL makes DPM.isDeviceManaged() accessible to the DO so that it
can be CTS-tested.

Bug: 32692748
Test: Device policy manager unit test + CTS & GTS in separate CLs

Change-Id: I5326e86b0ffee81d04bd48f0267044463a899b78

7 years agoMerge "Unit test for getBindDeviceAdminTargetUsers"
TreeHugger Robot [Wed, 30 Nov 2016 09:58:07 +0000 (09:58 +0000)]
Merge "Unit test for getBindDeviceAdminTargetUsers"

7 years agoMerge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1...
Mark Lu [Wed, 30 Nov 2016 09:30:08 +0000 (09:30 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e am: e5a3ad23fd
am: 835932f4c5

Change-Id: I0e23e30c6f5f29b6df50ec9dab0707c3ce73bfb4

7 years agoMerge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e
Mark Lu [Wed, 30 Nov 2016 09:24:30 +0000 (09:24 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e
am: e5a3ad23fd

Change-Id: I5c95a68b758730839309d9c7fde0ecc6415b3f83

7 years agoMerge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc
Mark Lu [Wed, 30 Nov 2016 09:19:26 +0000 (09:19 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc
am: 15df815e1e

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7

7 years agoMerge "Fix batterySendBroadcast not synchronized issue."
Mark Lu [Wed, 30 Nov 2016 09:14:31 +0000 (09:14 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue."
am: 32e756a4bc

Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17

7 years agoMerge "Fix batterySendBroadcast not synchronized issue."
Treehugger Robot [Wed, 30 Nov 2016 07:59:54 +0000 (07:59 +0000)]
Merge "Fix batterySendBroadcast not synchronized issue."

7 years agoMerge "Add an option to bit to not restart."
TreeHugger Robot [Wed, 30 Nov 2016 04:49:18 +0000 (04:49 +0000)]
Merge "Add an option to bit to not restart."

7 years agoMerge "Check if the display is attached when updating config"
TreeHugger Robot [Wed, 30 Nov 2016 04:33:36 +0000 (04:33 +0000)]
Merge "Check if the display is attached when updating config"

7 years agoMerge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewInte...
Anthony Hugh [Wed, 30 Nov 2016 03:43:13 +0000 (03:43 +0000)]
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f" into nyc-mr2-dev-plus-aosp
am: d644b89a35  -s ours

Change-Id: Idb05a64891031ee5b2afa1e94c611e02ba3cb5fd

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:43:08 +0000 (03:43 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f
am: a87e824100  -s ours

Change-Id: Ia1535d006eb369e4b79c7aa073d0319f1cf8a88f

7 years agoMerge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewInte...
Anthony Hugh [Wed, 30 Nov 2016 03:41:33 +0000 (03:41 +0000)]
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286" into nyc-mr2-dev-plus-aosp
am: a351145b9b  -s ours

Change-Id: I8ef5b99d3dcefe4f08e73390cab2e53de62ffb26

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:41:29 +0000 (03:41 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286
am: 219451211d  -s ours

Change-Id: I64111793f7cb350f7f155727934cabc5fbd2480f

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:39:45 +0000 (03:39 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
am: 6abec50032  -s ours

Change-Id: I8684c26867a84287f5e8ccee51eb1e15278338f1

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback...
Anthony Hugh [Wed, 30 Nov 2016 03:39:41 +0000 (03:39 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e
am: 1b9cec4860  -s ours

Change-Id: Ib57510dd24676e8b47789b5a5bd9cddabf2995df

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback...
Anthony Hugh [Wed, 30 Nov 2016 03:38:35 +0000 (03:38 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: 32a0b7351e
am: 9d6bb6929a  -s ours

Change-Id: I396efa56e2d0b2c91d5dfa5cb3ece2ded0144c34

7 years agoMerge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewInte...
Android Build Merger (Role) [Wed, 30 Nov 2016 03:35:34 +0000 (03:35 +0000)]
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewInte...
Android Build Merger (Role) [Wed, 30 Nov 2016 03:35:06 +0000 (03:35 +0000)]
Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286" into nyc-mr2-dev-plus-aosp

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:34:52 +0000 (03:34 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e
am: c27f8b025f

Change-Id: If30f47511137055e2fd6076f099bbd4ca5a9275b

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:34:28 +0000 (03:34 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e
am: f3eef9a286

Change-Id: I78ca0a2ee43d85c50bd1d68ee93d5b55e64b470d

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Android Build Merger (Role) [Wed, 30 Nov 2016 03:34:25 +0000 (03:34 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback...
Anthony Hugh [Wed, 30 Nov 2016 03:33:39 +0000 (03:33 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395
am: c2ca17711e

Change-Id: Ie33341632ddce8ba2a5704598c272360584cd209

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback...
Anthony Hugh [Wed, 30 Nov 2016 03:33:28 +0000 (03:33 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395
am: 32a0b7351e

Change-Id: Ie152811b2de678c1785af61375a79a728616b034

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:28:44 +0000 (03:28 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am: 75bf81458e

Change-Id: I82abdf00c00d2a735e6723d8a175f152be982aff

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
Anthony Hugh [Wed, 30 Nov 2016 03:28:39 +0000 (03:28 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am: 75bf81458e

Change-Id: If636be95a72d30ef643b66add737f77c5cbdf8d9

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
Anthony Hugh [Wed, 30 Nov 2016 03:28:37 +0000 (03:28 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am: f73d085395

Change-Id: I6d17a74e4030e20b7a08516d0b4ec90e31930c66

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
Anthony Hugh [Wed, 30 Nov 2016 03:28:34 +0000 (03:28 +0000)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am: f73d085395

Change-Id: I9cee73a7146ff97dcc7f82447f06281f71bc2466

7 years agoAdd fallback case in glGetShaderInfoLog
Romain Guy [Wed, 30 Nov 2016 03:26:29 +0000 (19:26 -0800)]
Add fallback case in glGetShaderInfoLog

Some drivers do not always report the proper info log length
through glGetShaderiv which causes the JNI bindings to return
an empty log string. This change falls back to a length of
512 bytes when the queried length is 0. This is the same
fallback used in libhwui.

Test: CtsOpenGLTest
Bug: 16624915
Change-Id: I86ea52903b280a86305eaaa83eefcf46a7a8d0b4

7 years agoMerge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent...
TreeHugger Robot [Wed, 30 Nov 2016 03:09:20 +0000 (03:09 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev

7 years agoMerge "Don't tie ephemeral resolver/installer"
TreeHugger Robot [Wed, 30 Nov 2016 02:21:42 +0000 (02:21 +0000)]
Merge "Don't tie ephemeral resolver/installer"

7 years agoAdd an option to bit to not restart.
Joe Onorato [Sun, 13 Nov 2016 00:34:25 +0000 (16:34 -0800)]
Add an option to bit to not restart.

Test: build & restart
Change-Id: Ia925053f04046d7fb91a47cfd5fd17a5d4fecf10

7 years agoMerge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21 am: 04cbf97d38
Andreas Gampe [Wed, 30 Nov 2016 01:31:58 +0000 (01:31 +0000)]
Merge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21 am: 04cbf97d38
am: a9b85deae7

Change-Id: Ifa1c964b926208f88070967dec7d2fad90c5e09a

7 years agoMerge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev am: 3a122d10fa
Pankaj Kanwar [Wed, 30 Nov 2016 01:30:53 +0000 (01:30 +0000)]
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev am: 3a122d10fa
am: 0d57eb0c69

Change-Id: I968d98c34c23422d15f4534d5102dbfc20c4bcd4

7 years agoAllow Carriers to specify Wifi Networks. am: 1ec8fe940f
pkanwar [Wed, 30 Nov 2016 01:29:50 +0000 (01:29 +0000)]
Allow Carriers to specify Wifi Networks. am: 1ec8fe940f
am: f6414d42e4  -s ours

Change-Id: Ia8dac0cc797addca0f18e62864d0b55ea9a6c3ea

7 years agoMerge "Introduce font variation settings parser"
Yirui Huang [Wed, 30 Nov 2016 01:13:00 +0000 (01:13 +0000)]
Merge "Introduce font variation settings parser"

7 years agoMerge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21
Andreas Gampe [Wed, 30 Nov 2016 01:04:24 +0000 (01:04 +0000)]
Merge "Preload2: Add sequence UI" am: 56ddac7fd7 am: b9d8535a21
am: 04cbf97d38

Change-Id: If1105b87b384a9b7933a006f5d35a076c836b630

7 years agoMerge "Preload2: Add sequence UI" am: 56ddac7fd7
Andreas Gampe [Wed, 30 Nov 2016 00:59:23 +0000 (00:59 +0000)]
Merge "Preload2: Add sequence UI" am: 56ddac7fd7
am: b9d8535a21

Change-Id: I721674c8381caa9c404c3708122f03d6c8d6d204

7 years agoMerge "Preload2: Add sequence UI"
Andreas Gampe [Wed, 30 Nov 2016 00:49:44 +0000 (00:49 +0000)]
Merge "Preload2: Add sequence UI"
am: 56ddac7fd7

Change-Id: I6ca6e1ea6c6721a24f7b1d3d7fb4715bd51aa0d9

7 years agoMerge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
Pankaj Kanwar [Wed, 30 Nov 2016 00:40:27 +0000 (00:40 +0000)]
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
am: 3a122d10fa

Change-Id: Ia6becd6b4c4224c8059b815b8bfa1523edffa432

7 years agoAllow Carriers to specify Wifi Networks.
pkanwar [Wed, 30 Nov 2016 00:40:22 +0000 (00:40 +0000)]
Allow Carriers to specify Wifi Networks.
am: 1ec8fe940f

Change-Id: I8bd0366bbbfd391af8328cf7bd1a2f81efb9a0d7

7 years agoMerge "Preload2: Add sequence UI"
Treehugger Robot [Wed, 30 Nov 2016 00:39:18 +0000 (00:39 +0000)]
Merge "Preload2: Add sequence UI"

7 years agoDon't tie ephemeral resolver/installer
Todd Kennedy [Tue, 29 Nov 2016 21:47:55 +0000 (13:47 -0800)]
Don't tie ephemeral resolver/installer

The ephemeral resolver and installer can now be added at separate
times. It will be possible to replace the installer dynamically.

Bug: 33073532
Test: Manual. Verify the installer and resolver are set correctly with different configurations.
Change-Id: I8071de8c5baadd03c9eb3e756ed7445d2116d51f

7 years agoMerge "Don't change visibility of fragment Views that aren't visible"
TreeHugger Robot [Wed, 30 Nov 2016 00:36:00 +0000 (00:36 +0000)]
Merge "Don't change visibility of fragment Views that aren't visible"

7 years agoMerge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
Pankaj Kanwar [Wed, 30 Nov 2016 00:33:33 +0000 (00:33 +0000)]
Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev

7 years agoMerge "Some cleanups for window cropping functionality."
TreeHugger Robot [Wed, 30 Nov 2016 00:24:12 +0000 (00:24 +0000)]
Merge "Some cleanups for window cropping functionality."

7 years agoMerge "Exit accessory mode after debounce timeout when necessary"
David Stevens [Wed, 30 Nov 2016 00:23:00 +0000 (00:23 +0000)]
Merge "Exit accessory mode after debounce timeout when necessary"

7 years agoMerge "Require INSTALL_PACKAGES permission"
TreeHugger Robot [Wed, 30 Nov 2016 00:14:31 +0000 (00:14 +0000)]
Merge "Require INSTALL_PACKAGES permission"

7 years agoDO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
Anthony Hugh [Tue, 22 Nov 2016 23:13:35 +0000 (15:13 -0800)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback

It looks like there was a regression where #onNewIntent() was called
before the FLAG_ACTIVITY_BROUGHT_TO_FRONT flag was set.  This
change updates the code so we set the flag properly.

BUG: 33034247
Change-Id: I61959a289dc5af14ee9d3d7bfa213191238efc88

7 years agoPreload2: Add sequence UI
Andreas Gampe [Mon, 28 Nov 2016 23:07:39 +0000 (15:07 -0800)]
Preload2: Add sequence UI

Add a fake UI that can run a sequence of actions (and replies).

Bug: 31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de

7 years agoAdd overdraw debugging feature to Skia pipelines
Matt Sarett [Mon, 14 Nov 2016 23:33:38 +0000 (18:33 -0500)]
Add overdraw debugging feature to Skia pipelines

Test: Compared to OpenGL pipeline and sanity checked
with understanding of the drawing pipeline.  Also
wrote a unit test.

BUG:32370375

Change-Id: Iab397d21f0def725fa89551d48c764c67fd2bda8

7 years agoMerge "Relax missing service check for normal apps."
Jeff Sharkey [Tue, 29 Nov 2016 22:16:36 +0000 (22:16 +0000)]
Merge "Relax missing service check for normal apps."

7 years agoSome cleanups for window cropping functionality.
Robert Carr [Tue, 18 Oct 2016 18:02:28 +0000 (11:02 -0700)]
Some cleanups for window cropping functionality.

At a high level I had two sorts of goals:

1. To remove the weird pinned logic in setSurfaceBoundariesLocked
2. To seperate base crop calculation, and animation exceptions, between
   window state and window state animator.

Itemized changes are as follows:

1. Rename updateSurfaceWindowCrop and calculateSurfaceWindowCrop to
   applyCrop/calculateCrop. It doesn't feel that "SurfaceWindow" was
   adding much.
2. Split screen space and window space (final v non) clip rect
   computation, to make clarity about when each one should be used.
3. Eliminate weird case for pinned stack in setSurfaceBoundaries by
   building it in to calculateFinalClipRect.
4. Extract calculateSystemDecorRect to WindowState as it mostly accesses
   window members.
5. Extract part of calculateCrop to WindowState as
   "calculatePolicyCrop". This was the part that fills mSystemDecorRect.
6. Extract wallpaper animation logic outside of calculatePolicyCrop

Test: bit FrameworksServicesTests:com.android.server.wm.WindowFrameTests
Change-Id: I8ff1dc6ec1206a34994f50ba44d765ab619efbff

7 years agoMerge "Fixed a crash when changing font scales"
Selim Cinek [Tue, 29 Nov 2016 20:58:56 +0000 (20:58 +0000)]
Merge "Fixed a crash when changing font scales"

7 years agoDon't change visibility of fragment Views that aren't visible
George Mount [Tue, 29 Nov 2016 19:36:17 +0000 (11:36 -0800)]
Don't change visibility of fragment Views that aren't visible

Bug 32864127

When a fragment creates a view that is either invisible or gone,
it should remain that way. This means that the fragment won't have
any animations. When transactions are optimized, transitions
will avoid invisible and gone fragment views, but unoptimized
transactions will lead to failed transitions because none of the
views will be visible.

Test: Ie71902d1b5f5f647c758a1bd60cdfd6814cda29d
Change-Id: If952f81859227a28569d234d8232ff6bb100e74c

7 years agoMerge "Allow overriding max profile in debugable builds."
Kenny Guy [Tue, 29 Nov 2016 20:12:12 +0000 (20:12 +0000)]
Merge "Allow overriding max profile in debugable builds."

7 years agoExit accessory mode after debounce timeout when necessary
David Stevens [Thu, 17 Nov 2016 23:14:02 +0000 (15:14 -0800)]
Exit accessory mode after debounce timeout when necessary

Change-Id: I1e7c1f4f31a310ff0369690a25859b33aaed14fc
Fixes: 29377436
Test: manual testing with 2011 ADK and multiple Android Auto headunits

7 years agoMerge "Fix CTS breakage in Context and Override configurations"
Adam Lesinski [Tue, 29 Nov 2016 20:07:34 +0000 (20:07 +0000)]
Merge "Fix CTS breakage in Context and Override configurations"

7 years agoFix CTS breakage in Context and Override configurations
Adam Lesinski [Tue, 29 Nov 2016 03:44:19 +0000 (19:44 -0800)]
Fix CTS breakage in Context and Override configurations

The base Activity resources need to be created differently so that
other configuration contexts can be rebased properly.
Bug:33166230
Test: cts-tradefed run cts --module CtsAndroidAppTestCases --test android.app.cts.ApplyOverrideConfigurationTests

Change-Id: I86def4e2414dc366dd1d5cbc9104c5d0c06a4d61

7 years agoCheck if the display is attached when updating config
Andrii Kulian [Wed, 23 Nov 2016 00:33:28 +0000 (16:33 -0800)]
Check if the display is attached when updating config

The display might not be added yet or be already detached when
config is updated.

Bug: 32983305
Test: android.media.cts.EncodeVirtualDisplayWithCompositionTest
Test: #testVirtualDisplayRecycles
Change-Id: I3b0e52e8ebb93a57ab6b0e80c0599db33ce2ae03

7 years agoRelax missing service check for normal apps.
Jeff Sharkey [Tue, 29 Nov 2016 19:54:39 +0000 (12:54 -0700)]
Relax missing service check for normal apps.

The new missing-service behavior was mostly added for core system
components, so don't wtf() when normal apps ask for missing services.

Continue to emit one-line log for third-party apps so they know why
getSystemService() might be returning null.

Test: builds, boots
Bug: 33109365
Change-Id: I3a6118a3db570d796a26da5b8d63015b13e53a87

7 years agoFixed a crash when changing font scales
Selim Cinek [Tue, 29 Nov 2016 18:35:42 +0000 (10:35 -0800)]
Fixed a crash when changing font scales

The shelf doesn't need to be reinflated but should
reload its properties. Recreating lead to a bunch
of crashes.

Change-Id: I4628e0469f74c1a0201f7b1e6e86d187ad0e548d
Test: Change font size, observe no crash
Fixes: 33189282

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 29 Nov 2016 19:20:58 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 29 Nov 2016 18:55:08 +0000 (18:55 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Allow Carriers to specify Wifi Networks."
Pankaj Kanwar [Tue, 29 Nov 2016 18:53:19 +0000 (18:53 +0000)]
Merge "Allow Carriers to specify Wifi Networks."

7 years agoMerge "Use transparent instead of null background during Activity Transitions"
George Mount [Tue, 29 Nov 2016 18:26:46 +0000 (18:26 +0000)]
Merge "Use transparent instead of null background during Activity Transitions"

7 years agoMerge "Make LD stateful / opacity management look more like DC"
TreeHugger Robot [Tue, 29 Nov 2016 18:05:36 +0000 (18:05 +0000)]
Merge "Make LD stateful / opacity management look more like DC"

7 years agoMerge "Create actions for permission and log revokations"
Philip P. Moltmann [Tue, 29 Nov 2016 17:46:28 +0000 (17:46 +0000)]
Merge "Create actions for permission and log revokations"