Commit Graph

60593 Commits

Author SHA1 Message Date
Mahaver Chopra
325af20235 Merge \"Add an api to verify if ro.device_owner was set\" into nyc-mr1-dev
am: c1182a8128

Change-Id: I6fecc2edf4ba78d60f509679c0b9b5367305f310
2016-07-12 09:54:59 +00:00
Mahaver Chopra
c1182a8128 Merge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev 2016-07-12 09:48:02 +00:00
Vladislav Kaznacheev
dc4d435dde Merge \\"Fix docs for DragEvent\\" into nyc-dev am: b6fa207c67
am: 879b3fb9ce

Change-Id: I93210c64927b5240622099a5715068f36d71bd57
2016-07-11 23:30:49 +00:00
Vladislav Kaznacheev
78004643e1 Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I7acfd89bb3cd51273007d8dc7b899ae6b95c7937
2016-07-11 23:26:31 +00:00
Vladislav Kaznacheev
879b3fb9ce Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I33c231d19065a5acc26472d4c3f175351d2a6d10
2016-07-11 23:26:05 +00:00
TreeHugger Robot
b6fa207c67 Merge "Fix docs for DragEvent" into nyc-dev 2016-07-11 23:17:42 +00:00
Makoto Onuki
fcf7db9eed Merge \"Handle package broadcasts before apps do\" into nyc-mr1-dev
am: ae13eee9c6

Change-Id: I4eee7d585bfe1218fae425f2b3f2097965924587
2016-07-11 21:40:25 +00:00
Jeff Sharkey
6e4fc19617 Merge \"Revert \"Treat everyone the same.\"\" into nyc-mr1-dev
am: 9dbc259b4f

Change-Id: Idbddd94cb16c2dee3891bcff14ceb618793dd767
2016-07-11 21:34:05 +00:00
Makoto Onuki
ae13eee9c6 Merge "Handle package broadcasts before apps do" into nyc-mr1-dev 2016-07-11 21:29:59 +00:00
Jeff Sharkey
9dbc259b4f Merge "Revert "Treat everyone the same."" into nyc-mr1-dev 2016-07-11 21:23:31 +00:00
Vladislav Kaznacheev
3067bc69d9 Fix docs for DragEvent
Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1
2016-07-11 13:52:22 -07:00
Tim Murray
6ab97e587e Merge changes from topic \'stune\' into nyc-mr1-dev
am: b646ec13e1

Change-Id: I9d21ab285810d4c218ff0854b98cf7fc0d555236
2016-07-11 20:37:19 +00:00
Tim Murray
b646ec13e1 Merge changes from topic 'stune' into nyc-mr1-dev
* changes:
  Put bootanimation in top-app stune group.
  Sets android.ui to be in the fg stune group.
2016-07-11 20:29:40 +00:00
Mark Lu
d6be96c21d Merge \\"docs: fixed broken link in UsbManager javadocs\\" into nyc-dev am: 162a6fad72
am: e67f00705f

Change-Id: I69478885b31789008b411c5ec3a06d820efcca3f
2016-07-11 20:28:17 +00:00
Mark Lu
e67f00705f Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: Ifb20f4b32ec6a6972a5ee1f832d91e1c169bb543
2016-07-11 20:20:39 +00:00
Mark Lu
3e15a43732 Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: If11947a089756b7ca72f6a579d4b1cbe54535185
2016-07-11 20:20:31 +00:00
Mark Lu
162a6fad72 Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev 2016-07-11 20:13:47 +00:00
Makoto Onuki
a2241834a5 Handle package broadcasts before apps do
- Have PM to call the shortcut manager directly before sending a
pacakge broadcast.

- The shortcut manager will enqueue a task to handle a package
broadcast, which will be executed on Handler.

- At the entry points of all external facing methods, block until
all pending tasks are finished.

Bug 29895275

Change-Id: Ib29fa3c9c8d9b9e0ca5c8f1e9da2a390324960a4
2016-07-11 11:28:10 -07:00
Makoto Onuki
d4255a9c95 Merge \"ShortcutManager javadoc\" into nyc-mr1-dev
am: 3746d2224d

Change-Id: I1a856a61c3453acd02a2541533a268ade9dd5933
2016-07-11 17:58:34 +00:00
Makoto Onuki
3746d2224d Merge "ShortcutManager javadoc" into nyc-mr1-dev 2016-07-11 17:48:50 +00:00
Jeff Sharkey
f9c41aeeb5 Revert "Treat everyone the same."
This reverts commit 7678aeddd9.

Bug: 30051184, 29746499
Change-Id: Ibd8bc2771d67c4db61c82dcc8a569eb8adfef8de
2016-07-11 16:22:29 +00:00
Makoto Onuki
4a91096a4c ShortcutManager javadoc
Bug 29515722

Change-Id: If4805a7f28a2ee602094fca06eb1ff30f258dc1e
2016-07-11 09:08:49 -07:00
Erik Kline
915d09b5d4 Support requesting async LinkProperties/NetworkCapabilities updates
am: acdd639513

Change-Id: Icc048323debbbe641941c5c0d993f4c9782c5d3e
2016-07-11 11:01:42 +00:00
Erik Kline
461e4fff31 Basic IPv6 Router Advertisement daemon
am: a3ca6bd3e0

Change-Id: I242eb8e932581a537a47f31e3f16c7e776da91cf
2016-07-11 10:38:49 +00:00
Mahaver Chopra
790d198860 Add an api to verify if ro.device_owner was set
Currently for OobConfig app we used DEVICE_PROVISIONED Global setting to
verify if device was provisioned. This setting can be modified using
adb. we just need to know if it was set atleast once. Added an api in
DPM to return whether system property "ro.device_owner" was set.

Bug: 29935702
Change-Id: I9a2b5217c0bc2cc11d68282e05a5450ea3f6cf21
2016-07-11 11:22:52 +01:00
Erik Kline
acdd639513 Support requesting async LinkProperties/NetworkCapabilities updates
Bug: 9580643
Change-Id: I1d7ba7645c20d7d53f6eef777dfce43727940f13
2016-07-11 19:17:41 +09:00
Erik Kline
a3ca6bd3e0 Basic IPv6 Router Advertisement daemon
Bug: 9580643
Change-Id: Iebd4d1f694699ffd4daf7d71e9b9d8f49e9b632f
2016-07-11 18:37:25 +09:00
Doris Ling
b8d3caf4b8 Merge \"Add a secure setting for double twist gesture for camera flip.\" into nyc-mr1-dev
am: 3e869587e8

Change-Id: If64a188d45beea48d264219df8a9c7bce63bcecf
2016-07-09 00:03:08 +00:00
Doris Ling
3e869587e8 Merge "Add a secure setting for double twist gesture for camera flip." into nyc-mr1-dev 2016-07-08 23:58:46 +00:00
Tim Murray
4074ad01e8 Sets android.ui to be in the fg stune group.
setThreadGroup(TOP_APP) will place a thread in the fg stune group but
not the top_app cpuset. This allows android.ui to get more runtime to
render transitions between activities without impacting its CPU
placement.

bug 29512132

Change-Id: I95e031975f83290f88ac6e538abf1062aea27ed4
2016-07-08 15:45:45 -07:00
Jorim Jaggi
0483184454 Merge \"Preparations for different scrim depending on wallpaper\" into nyc-mr1-dev
am: 702589d060

Change-Id: I32c188034c773836ade46ddab63606e7e88400de
2016-07-08 22:19:42 +00:00
TreeHugger Robot
702589d060 Merge "Preparations for different scrim depending on wallpaper" into nyc-mr1-dev 2016-07-08 22:13:51 +00:00
Doris Ling
a60d31d70f Add a secure setting for double twist gesture for camera flip.
Add Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED to control whether the
double twist gesture should flip the camera between front and back mode
is enabled or not. Also move SYSTEM_NAVIGATION_KEYS_ENABLED from
Global to Secure.

Bug: 29869445
Change-Id: I614289e6de7b1ee4221de7047a5e0dd784607bed
2016-07-08 14:32:32 -07:00
Justin Klaassen
1228803cde Merge \"Add Night display feature\" into nyc-mr1-dev
am: 76262b8e14

Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
2016-07-08 21:15:35 +00:00
Eino-Ville Talvala
9b74b46034 Merge \"Camera2: Add @hide variant for openCamera for UID forwarding\" into nyc-mr1-dev
am: 8c22370331

Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332
2016-07-08 21:15:20 +00:00
Justin Klaassen
76262b8e14 Merge "Add Night display feature" into nyc-mr1-dev 2016-07-08 21:07:48 +00:00
TreeHugger Robot
8c22370331 Merge "Camera2: Add @hide variant for openCamera for UID forwarding" into nyc-mr1-dev 2016-07-08 21:02:51 +00:00
Eino-Ville Talvala
62deabcc4f Camera2: Add @hide variant for openCamera for UID forwarding
Trusted services may open a camera device on behalf of some client
of theirs; such services need to forward the UID of their client to
the camera service for validation of permissions, etc.

Add a variant of openCamera that makes this simple, only accessible
to unbundled services for now.  Only services explicitly trusted
by the camera service can pass an argument other than USE_CALLING_UID
to this method.

Bug: 27616192
Change-Id: Idb06112201b805a8b5c979b5f0761fec1c6994a3
2016-07-08 12:11:11 -07:00
Justin Klaassen
911e88939c Add Night display feature
Bug: 28615069

Tints the display at night automatically according to your schedule or
using the sunrise/sunset corresponding to your current location.

Change-Id: Ie56b4eed88cc2fcbae88002492b1edad5820b6b1
2016-07-08 11:47:50 -07:00
Andreas Gampe
5c1dc014ca Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
am: 56177bf81b

Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
2016-07-08 18:19:33 +00:00
Andreas Gampe
56177bf81b Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev 2016-07-08 18:09:54 +00:00
Suprabh Shukla
087d33febf Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev
am: 33fa5dfa1d

Change-Id: Ife69e438d83ddfb75433f92c6c5521ae4c3f82cc
2016-07-08 14:44:53 +00:00
TreeHugger Robot
33fa5dfa1d Merge "Making timeouts configurable through Settings" into nyc-mr1-dev 2016-07-08 14:36:34 +00:00
Andreas Gampe
d281b4204a Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
Breaks monkey in root mode.

This reverts commit 6e16714c68.

Bug: 29338430
Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
2016-07-08 03:50:27 +00:00
Todd Kennedy
296b9edfb5 Merge \"Add values to ApplicationInfoFlags\" into nyc-mr1-dev
am: 6ac6ceb28b

Change-Id: I3aa2488496d7f21440c2bef03944b0f2bdaaa0b3
2016-07-07 23:24:00 +00:00
TreeHugger Robot
6ac6ceb28b Merge "Add values to ApplicationInfoFlags" into nyc-mr1-dev 2016-07-07 23:15:26 +00:00
Todd Kennedy
5a32c6c290 Add values to ApplicationInfoFlags
Need to add MATCH_DISABLED_UNTIL_USED_COMPONENTS [and the deprecated
GET_DISABLED_UNTIL_USED_COMPONENTS] since those are used when building
the ApplicationInfo object.

Bug: 29824931
Change-Id: I09b24427222fed082f0946717826d2e0db857c7a
2016-07-07 14:29:06 -07:00
Suprabh Shukla
dbbc7af063 Making timeouts configurable through Settings
Adding a global setting for timeouts used in retail demo mode.
Also renaming the protected intent ACTION_RESET_DEMO to reflect proper
owner package.

Bug: 29917613
Change-Id: I9a174503626ab28cceb5024a8e63d27612439b92
2016-07-07 14:12:14 -07:00
Makoto Onuki
639a862315 Merge \"Hide more shortcut APIs\" into nyc-mr1-dev
am: 07e234c9d7

Change-Id: If18c62359352c928e2b36c42563d5223c517964e
2016-07-07 21:10:00 +00:00
Makoto Onuki
07e234c9d7 Merge "Hide more shortcut APIs" into nyc-mr1-dev 2016-07-07 20:52:23 +00:00