OSDN Git Service

android-x86/frameworks-base.git
8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854ef84f7a7aff109b5bec824190f9ebfa)

8 years agoMerge \"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:21:12 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb

8 years agoMerge "Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev

8 years agoMerge \\"API updated for ICU4J 57.1\\" am: 4861329f57
Joachim Sauer [Thu, 16 Jun 2016 13:09:12 +0000 (13:09 +0000)]
Merge \\"API updated for ICU4J 57.1\\" am: 4861329f57
am: 438dc91a41

Change-Id: I16a88e2346435b60cc7844784f30be82a775bf5d

8 years agoMerge \"API updated for ICU4J 57.1\"
Fredrik Roubert [Thu, 16 Jun 2016 13:03:50 +0000 (13:03 +0000)]
Merge \"API updated for ICU4J 57.1\"
am: 4861329f57

Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c

8 years agoMerge "API updated for ICU4J 57.1"
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"

8 years agoMerge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:38:20 +0000 (12:38 +0000)]
Merge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172
am: d37e23c50c

Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408

8 years agoMerge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368

8 years agoMerge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20

8 years agoMerge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
Ricky Wai [Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60

8 years agoMerge "Add permission checking on service calls in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 16 Jun 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:26:34 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76  -s ours

Change-Id: I892cb57187ad5229701d24112490ac48182c5319

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665

8 years agoMerge "Move 'is already always-on' check into Vpn.java" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:06:10 +0000 (10:06 +0000)]
Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2  -s ours

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 08:42:16 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8186498fb657aa424eeb74f965fa44f7a053f65c
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 04:49:11 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import

8 years agoMerge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505

8 years agoMerge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices.
Ruben Brunk [Thu, 16 Jun 2016 01:37:26 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am: d430f1a0be

Change-Id: Ibd5f32c4afe864167411c3876e5ab0cc4de33293

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices.
Ruben Brunk [Thu, 16 Jun 2016 00:55:41 +0000 (17:55 -0700)]
Remove coarse location pre-grant for preinstalled VrListenerServices.

Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6

8 years agoMerge \"Fix VR transition for display on/off sequence.\" into nyc-dev
Ruben Brunk [Thu, 16 Jun 2016 00:38:05 +0000 (00:38 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am: 931a7c03e0

Change-Id: I406724ea21cd7cfde2be6aa922ac636c7b7f23a8

8 years agoMerge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
Mihai Nita [Thu, 16 Jun 2016 00:37:54 +0000 (00:37 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25

8 years agoMerge "Fix VR transition for display on/off sequence." into nyc-dev
Ruben Brunk [Thu, 16 Jun 2016 00:29:31 +0000 (00:29 +0000)]
Merge "Fix VR transition for display on/off sequence." into nyc-dev

8 years agoMerge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
Mihai Niță [Thu, 16 Jun 2016 00:28:35 +0000 (00:28 +0000)]
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev

8 years agoFix VR transition for display on/off sequence.
Ruben Brunk [Thu, 16 Jun 2016 00:08:35 +0000 (17:08 -0700)]
Fix VR transition for display on/off sequence.

- Ensure VR transition has been applied before display power
  off sequence.

Bug: 29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d

8 years agoMerge \"More thorough cleansing of expired users\" into nyc-dev
Amith Yamasani [Thu, 16 Jun 2016 00:24:17 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am: 4f2b1b455e

Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a

8 years agoMerge "More thorough cleansing of expired users" into nyc-dev
Amith Yamasani [Thu, 16 Jun 2016 00:14:57 +0000 (00:14 +0000)]
Merge "More thorough cleansing of expired users" into nyc-dev

8 years agoFix for NullPointerException in SuggestedLocaleAdapter
Mihai Nita [Wed, 15 Jun 2016 23:34:50 +0000 (16:34 -0700)]
Fix for NullPointerException in SuggestedLocaleAdapter

Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69

8 years agoAdded dismiss, expand, and collapse accessibility actions
Selim Cinek [Wed, 15 Jun 2016 18:46:37 +0000 (11:46 -0700)]
Added dismiss, expand, and collapse accessibility actions

Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1

8 years agoMerge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
Mady Mellor [Wed, 15 Jun 2016 23:27:41 +0000 (23:27 +0000)]
Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am: 8363980d45

Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e

8 years agoMerge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev
Mady Mellor [Wed, 15 Jun 2016 23:20:22 +0000 (23:20 +0000)]
Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev

8 years agoMerge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into...
Bert McMeen [Wed, 15 Jun 2016 23:13:31 +0000 (23:13 +0000)]
Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04
am: 0caf0b7259

Change-Id: I1fb1c058b95de1786dd4484a9bde085c522d2af5

8 years agoMerge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc...
Bert McMeen [Wed, 15 Jun 2016 23:08:28 +0000 (23:08 +0000)]
Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am: 9011149e19
am: 7250594f04

Change-Id: I486c9ee933a6ed64d90013cf9964e7106713dde8

8 years agoMerge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc...
Bert McMeen [Wed, 15 Jun 2016 23:03:13 +0000 (23:03 +0000)]
Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
am: 9011149e19

Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140

8 years agoMerge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io...
Bert McMeen [Wed, 15 Jun 2016 22:57:57 +0000 (22:57 +0000)]
Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs

8 years agoMerge \"Fixing issue with screen pinning screen not showing for secondary users....
Winson [Wed, 15 Jun 2016 22:57:30 +0000 (22:57 +0000)]
Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I4b7de84af1cf78a8871fccd555e27d4997cc21a2

8 years agoMerge "Fixing issue with screen pinning screen not showing for secondary users."...
TreeHugger Robot [Wed, 15 Jun 2016 22:48:53 +0000 (22:48 +0000)]
Merge "Fixing issue with screen pinning screen not showing for secondary users." into nyc-dev

8 years agoMerge \"Handle Concurrency issues in Connection\" into nyc-dev
Brad Ebinger [Wed, 15 Jun 2016 22:44:46 +0000 (22:44 +0000)]
Merge \"Handle Concurrency issues in Connection\" into nyc-dev
am: df41725e53

Change-Id: I67aa42350cf8ec3e998f42a7856e19ac887a5553

8 years agoMerge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
Adam Lesinski [Wed, 15 Jun 2016 22:44:43 +0000 (22:44 +0000)]
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am: 464bda8a2b

Change-Id: I352c56482aca030efab49ca39301679b51e44e05

8 years agoMerge "Handle Concurrency issues in Connection" into nyc-dev
Brad Ebinger [Wed, 15 Jun 2016 22:37:44 +0000 (22:37 +0000)]
Merge "Handle Concurrency issues in Connection" into nyc-dev

8 years agoMerge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
Adam Lesinski [Wed, 15 Jun 2016 22:35:25 +0000 (22:35 +0000)]
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev

8 years agoMerge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 21:42:20 +0000 (21:42 +0000)]
Merge \"docs: Added AfW item to DP4 \"Behavior Changes\" page\" into nyc-dev
am: 8e8fb7dda0

Change-Id: I9533642e3685f70351e46e29b8503569ae25dc50

8 years agoMerge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 21:36:02 +0000 (21:36 +0000)]
Merge "docs: Added AfW item to DP4 "Behavior Changes" page" into nyc-dev

8 years agoMerge "Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4 am: 403aa6e...
Android Build Merger (Role) [Wed, 15 Jun 2016 21:22:23 +0000 (21:22 +0000)]
Merge "Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4 am: 403aa6e3ec" into nyc-dev-plus-aosp

8 years agoMerge \\"Delete simple reduction implementation.\\" am: e8909dc0f4
David Gross [Wed, 15 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge \\"Delete simple reduction implementation.\\" am: e8909dc0f4
am: 403aa6e3ec

Change-Id: I56d6d5806c064fa22b969b53dc2e7028f51d78cc

8 years agoMerge \"Send VR mode notification to AR app on context hub\" into nyc-dev
Brian Duddie [Wed, 15 Jun 2016 21:19:18 +0000 (21:19 +0000)]
Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am: 9a31e8be48

Change-Id: I2ca21c574b86544ddf597290670ecea4a004e4d6

8 years agoMerge \"added null check in doInBackground and if null, properly intializes variables...
Richard Ho [Wed, 15 Jun 2016 21:19:08 +0000 (21:19 +0000)]
Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev
am: 07a375186e

Change-Id: I5f42789366c96386f7870d2b38c7530cd2bac81d

8 years agoMerge \"Delete simple reduction implementation.\"
David Gross [Wed, 15 Jun 2016 21:11:19 +0000 (21:11 +0000)]
Merge \"Delete simple reduction implementation.\"
am: e8909dc0f4

Change-Id: I76f07b8fc893ac8b67b131b84e34594b0fd3d9b1

8 years agoMerge "Send VR mode notification to AR app on context hub" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 21:09:31 +0000 (21:09 +0000)]
Merge "Send VR mode notification to AR app on context hub" into nyc-dev

8 years agoMerge "added null check in doInBackground and if null, properly intializes variables...
Richard Ho [Wed, 15 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge "added null check in doInBackground and if null, properly intializes variables." into nyc-dev

8 years agoFixing issue with screen pinning screen not showing for secondary users.
Winson [Wed, 15 Jun 2016 19:31:03 +0000 (12:31 -0700)]
Fixing issue with screen pinning screen not showing for secondary users.

- Catch the exception when removing a view that is not yet attached.
  This is not an issue because we are in the process of attaching it for
  the first time anyways.
- Ensure that we post the calls from the secondary user in the main
  thread for the system user.  Especially since this calls through to
  add the view for the new screen pinning window.

Bug: 29341417
Change-Id: If0e29a77ddb67426115f1d5d9f1adb580a1f07df

8 years agoCompute AnyMotionDetector angle using atan2. Bug: 29232136 am: db843c913f am: e46d4fd7ad
Kevin Gabayan [Wed, 15 Jun 2016 20:55:42 +0000 (20:55 +0000)]
Compute AnyMotionDetector angle using atan2. Bug: 29232136 am: db843c913f am: e46d4fd7ad
am: 68dd6233bd

Change-Id: I63376fc9763bc11b7934e2a9b45c95a8c3745b32

8 years agoMerge \"Fix a naming typo for source_build\" into nyc-dev
Tianjie Xu [Wed, 15 Jun 2016 20:55:31 +0000 (20:55 +0000)]
Merge \"Fix a naming typo for source_build\" into nyc-dev
am: dfa654edfe

Change-Id: Ie58c4fa52cec17cec430770fec01e43a5ff5153e

8 years agoHandle Concurrency issues in Connection
Brad Ebinger [Wed, 15 Jun 2016 00:04:01 +0000 (17:04 -0700)]
Handle Concurrency issues in Connection

Currently, there is a possibility of concurrent thread operations to the
Extras bundle in Conference/Connection. This can cause unexpected
behavior. We have added a lock on the Extras to prevent that from
occuring.

Bug: 29330310
Change-Id: Id63a9797c2f748120a3df8e3ce06c4ce3891c651

8 years agoCompute AnyMotionDetector angle using atan2. Bug: 29232136 am: db843c913f
Kevin Gabayan [Wed, 15 Jun 2016 20:49:49 +0000 (20:49 +0000)]
Compute AnyMotionDetector angle using atan2. Bug: 29232136 am: db843c913f
am: e46d4fd7ad

Change-Id: I666fc7432cf6140c938423ec4370ca7727996bd6

8 years agoMerge "Fix a naming typo for source_build" into nyc-dev
Tianjie Xu [Wed, 15 Jun 2016 20:46:07 +0000 (20:46 +0000)]
Merge "Fix a naming typo for source_build" into nyc-dev

8 years agoCompute AnyMotionDetector angle using atan2. Bug: 29232136
Kevin Gabayan [Wed, 15 Jun 2016 20:40:34 +0000 (20:40 +0000)]
Compute AnyMotionDetector angle using atan2. Bug: 29232136
am: db843c913f

Change-Id: I1d2af755dd1a06fc2fef464b6ad5bc5e26f11ff6

8 years agoFixes issue with group backgrounds when animating to keyguard
Mady Mellor [Thu, 9 Jun 2016 17:42:42 +0000 (10:42 -0700)]
Fixes issue with group backgrounds when animating to keyguard

The backgrounds weren't being updated before the collapse animation when
going to the keyguard so it would look very bad when they collapsed.

This moves updating the background into setChildrenExpanded which will
cover updating the background for both the tapping to expand case as
well as the animating to the keyguard case.

Change-Id: Icba2fa895498d307a38bd9f65be06265afd21a1a
Fixes: 29240532

8 years agoFix a naming typo for source_build
Tianjie Xu [Wed, 15 Jun 2016 19:31:53 +0000 (12:31 -0700)]
Fix a naming typo for source_build

When parsing the last_install, the variable name is supposed to be
*source_build* instead of *source_version*.

Bug: 28658632
Change-Id: I1e0ed7150e04885f904b6a3efa18bd5cfe17cc96

8 years agoMerge \"docs: Updates to DP4 release notes for Android for Work\" into nyc-dev
Andrew Solovay [Wed, 15 Jun 2016 19:26:37 +0000 (19:26 +0000)]
Merge \"docs: Updates to DP4 release notes for Android for Work\" into nyc-dev
am: 215b85a738

Change-Id: Ib527d2b3aa5bfa12b978bd80f89434878ba0c4a1

8 years agoMerge "docs: Updates to DP4 release notes for Android for Work" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 19:21:49 +0000 (19:21 +0000)]
Merge "docs: Updates to DP4 release notes for Android for Work" into nyc-dev

8 years agoResourcesManager: Allow managed addition of library asset paths
Adam Lesinski [Tue, 14 Jun 2016 18:05:23 +0000 (11:05 -0700)]
ResourcesManager: Allow managed addition of library asset paths

This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.

Bug:29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9

8 years agoMerge "Delete simple reduction implementation."
David Gross [Wed, 15 Jun 2016 18:44:03 +0000 (18:44 +0000)]
Merge "Delete simple reduction implementation."

8 years agoSend VR mode notification to AR app on context hub
Brian Duddie [Tue, 14 Jun 2016 22:12:26 +0000 (15:12 -0700)]
Send VR mode notification to AR app on context hub

Bug: 28793778
Change-Id: I7417ba7f696dc61689687bd56b165a81aea1715a

8 years agoMore thorough cleansing of expired users
Amith Yamasani [Mon, 13 Jun 2016 19:09:36 +0000 (12:09 -0700)]
More thorough cleansing of expired users

If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.

Mark the users' system folders with the correct
serial number for later verification.

AccountManager shouldn't be querying accounts of
partially created/destroyed users.

Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673

8 years agoadded null check in doInBackground and if null, properly intializes
Richard Ho [Mon, 13 Jun 2016 23:54:04 +0000 (16:54 -0700)]
added null check in doInBackground and if null, properly intializes
variables.

Bug:29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085
(cherry picked from commit 0f0f5414f4860de7f5e98d783b3172a39a42df2f)

8 years agoMerge \"docs: removing duplicate security config doc\" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 18:09:57 +0000 (18:09 +0000)]
Merge \"docs: removing duplicate security config doc\" into nyc-dev
am: d5f7bf8032

Change-Id: Ic6be2f3422eec325e31997ba75732074017443c4

8 years agoMerge \"A11y: Fix notification bounds when top notification is scrolled\" into nyc-dev
Adrian Roos [Wed, 15 Jun 2016 18:06:23 +0000 (18:06 +0000)]
Merge \"A11y: Fix notification bounds when top notification is scrolled\" into nyc-dev
am: 2e0aadf256

Change-Id: I73affa5f95d853c34be508da10092e94c7f24e72

8 years agodocs: Added AfW item to DP4 "Behavior Changes" page
Andrew Solovay [Wed, 15 Jun 2016 18:04:59 +0000 (11:04 -0700)]
docs: Added AfW item to DP4 "Behavior Changes" page

See first comment for doc stage location.

Change-Id: I188eb64a2fc854f82e4493213938346cd5847b5b

8 years agoMerge "docs: removing duplicate security config doc" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 18:02:50 +0000 (18:02 +0000)]
Merge "docs: removing duplicate security config doc" into nyc-dev

8 years agoMerge "A11y: Fix notification bounds when top notification is scrolled" into nyc-dev
Adrian Roos [Wed, 15 Jun 2016 17:55:51 +0000 (17:55 +0000)]
Merge "A11y: Fix notification bounds when top notification is scrolled" into nyc-dev

8 years agoMerge \"Clear calling identity before calling mountService\" into nyc-dev
Toni Barzic [Wed, 15 Jun 2016 17:53:10 +0000 (17:53 +0000)]
Merge \"Clear calling identity before calling mountService\" into nyc-dev
am: b2a45c00f6

Change-Id: I4f5856f2ea1d820ef6f67988222f2301a57a7585

8 years agodocs: removing duplicate security config doc
Joe Fernandez [Wed, 15 Jun 2016 17:50:42 +0000 (10:50 -0700)]
docs: removing duplicate security config doc

current doc: https://developer.android.com/preview/features/security-config.html
The N Preview version of this page will move to this location when N is
officially released.

Change-Id: Idf3bb2ea13b5f08efd3187bb1b1fbb6944519507

8 years agoMerge "Clear calling identity before calling mountService" into nyc-dev
Toni Barzic [Wed, 15 Jun 2016 17:45:55 +0000 (17:45 +0000)]
Merge "Clear calling identity before calling mountService" into nyc-dev

8 years agodocs: Updates to DP4 release notes for Android for Work
Andrew Solovay [Wed, 15 Jun 2016 16:54:57 +0000 (09:54 -0700)]
docs: Updates to DP4 release notes for Android for Work

See first comment for doc stage location.

Change-Id: I20ee0f104ebf2eb274e599ede8bfe5c0c59077fe

8 years agoA11y: Fix notification bounds when top notification is scrolled
Adrian Roos [Tue, 14 Jun 2016 22:51:40 +0000 (15:51 -0700)]
A11y: Fix notification bounds when top notification is scrolled

Previously, scrolled notifications would collapse into a stack (the top
stack). With the new design, that's no longer the case, so tall
notifications can now be scrolled out so much that their translation
becomes negative.

Unfortunatly, getBoundsOnScreen then clips the bounds to the parent,
which interferes with our adjustment to the bounds, so we first undo
the clipping.

Fixes: 29368064
Change-Id: I71da054ed1eb6d06868d56e18d0320f764ed86b3

8 years agoMerge \"Fix flashlight dim state\" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 17:03:45 +0000 (17:03 +0000)]
Merge \"Fix flashlight dim state\" into nyc-dev
am: 817c4ca6d4

Change-Id: I190cc69db49086b4acbf6e99c359ffa93b1ef956

8 years agoMerge "Fix flashlight dim state" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 16:55:21 +0000 (16:55 +0000)]
Merge "Fix flashlight dim state" into nyc-dev

8 years agoMerge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
Robert Carr [Wed, 15 Jun 2016 16:47:54 +0000 (16:47 +0000)]
Merge \"PopupWindow: Resolve measure specs before passing to WM.\" into nyc-dev
am: 4a284be41d

Change-Id: I356e7202bd8939eb5543190f17893abd43c0a0a6

8 years agoMerge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 16:41:50 +0000 (16:41 +0000)]
Merge "PopupWindow: Resolve measure specs before passing to WM." into nyc-dev

8 years agoMerge \"Revert \"boost starred people to at least high importance\"\" into nyc-dev
Chris Wren [Wed, 15 Jun 2016 15:52:14 +0000 (15:52 +0000)]
Merge \"Revert \"boost starred people to at least high importance\"\" into nyc-dev
am: f156ab3f3a

Change-Id: I66e7fb0d71ce8e52f2ec08dfdf07f14596a9e385

8 years agoMerge "Revert "boost starred people to at least high importance"" into nyc-dev
Chris Wren [Wed, 15 Jun 2016 15:42:23 +0000 (15:42 +0000)]
Merge "Revert "boost starred people to at least high importance"" into nyc-dev

8 years agoMerge \"Fix accessibility for autorotate tile.\" into nyc-dev
Julia Reynolds [Wed, 15 Jun 2016 15:02:27 +0000 (15:02 +0000)]
Merge \"Fix accessibility for autorotate tile.\" into nyc-dev
am: 7f9e4d13c0

Change-Id: Ifb1575b9b50696242c46b690e061fcd350660ed7

8 years agoMerge \"Update semantics of on-body Keystore API.\" into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 14:55:50 +0000 (14:55 +0000)]
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
am: c152fc15a9

Change-Id: Ic9a083b5f7c458c2aa7e218168c461da7fc154d0

8 years agoMerge "Fix accessibility for autorotate tile." into nyc-dev
Julia Reynolds [Wed, 15 Jun 2016 14:54:40 +0000 (14:54 +0000)]
Merge "Fix accessibility for autorotate tile." into nyc-dev

8 years agoFix flashlight dim state
Jason Monk [Wed, 15 Jun 2016 14:53:03 +0000 (10:53 -0400)]
Fix flashlight dim state

Change-Id: I7875d4a0c3733ac2462713d7618d1b7595ea2075
Fixes: 29330406

8 years agoMerge "Update semantics of on-body Keystore API." into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 14:48:52 +0000 (14:48 +0000)]
Merge "Update semantics of on-body Keystore API." into nyc-dev

8 years agoMerge \"Make lid switch edge rather than level triggered.\" into nyc-dev
Michael Wright [Wed, 15 Jun 2016 14:46:47 +0000 (14:46 +0000)]
Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am: e85da2bc2e

Change-Id: I20b3665d2ea3323991166936d47d85399d679aa4

8 years agoMerge "Make lid switch edge rather than level triggered." into nyc-dev
Michael Wright [Wed, 15 Jun 2016 14:34:55 +0000 (14:34 +0000)]
Merge "Make lid switch edge rather than level triggered." into nyc-dev

8 years agoAdd permission checking on service calls in LockSettingsService
Ricky Wai [Tue, 31 May 2016 11:05:05 +0000 (12:05 +0100)]
Add permission checking on service calls in LockSettingsService

Bug: 28941207
Change-Id: I113db10bb57f250d44361a0a5144a7d1c990ba4d

8 years agoMerge \"Update the DP4 setup instruction for api level 24\" into nyc-dev
smain@google.com [Wed, 15 Jun 2016 04:43:08 +0000 (04:43 +0000)]
Merge \"Update the DP4 setup instruction for api level 24\" into nyc-dev
am: 627bca6e80

Change-Id: Id96cdca298e44f0cfee347c1be82cd22222d24ba

8 years agoMerge "Update the DP4 setup instruction for api level 24" into nyc-dev
Scott Main [Wed, 15 Jun 2016 04:36:10 +0000 (04:36 +0000)]
Merge "Update the DP4 setup instruction for api level 24" into nyc-dev

8 years agoUpdate the DP4 setup instruction for api level 24
smain@google.com [Wed, 15 Jun 2016 00:03:36 +0000 (17:03 -0700)]
Update the DP4 setup instruction for api level 24

Change-Id: I8db52d56b1c33e02cffb589a19b1cb1ed20894f4

8 years agoMerge \"Revert \"docs: Add Videos section to N Preview landing page\"\" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 04:15:54 +0000 (04:15 +0000)]
Merge \"Revert \"docs: Add Videos section to N Preview landing page\"\" into nyc-dev
am: d320c6315a

Change-Id: I04fe2061fcddd36ffa4c38504780c31ae29e9198

8 years agoMerge \"docs: Updates for DP4 release\" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 04:15:51 +0000 (04:15 +0000)]
Merge \"docs: Updates for DP4 release\" into nyc-dev
am: 7c79f1663c

Change-Id: I064f37139fc3e9638786a03b5af5287b94f2b9ed

8 years agoMerge "Revert "docs: Add Videos section to N Preview landing page"" into nyc-dev
Joe Fernandez [Wed, 15 Jun 2016 04:10:14 +0000 (04:10 +0000)]
Merge "Revert "docs: Add Videos section to N Preview landing page"" into nyc-dev