Amith Yamasani
634841d448
Merge \\"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf7665\\" into nyc-mr1-dev am: d2e6a62838
...
am: b493ce833b
2016-07-12 18:05:39 +00:00
Amith Yamasani
b493ce833b
Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665\" into nyc-mr1-dev
...
am: d2e6a62838
2016-07-12 17:55:05 +00:00
Amith Yamasani
3bfbc531b3
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
...
am: e278cf7665
2016-07-12 17:46:58 +00:00
Amith Yamasani
e278cf7665
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
2016-07-12 17:40:13 +00:00
Makoto Onuki
be0e56e9d2
Merge \\"Throw ActivityNotFoundException when failed to launch shortcut\\" into nyc-mr1-dev am: 50752f7391
...
am: b1e0982173
2016-07-12 17:19:36 +00:00
Makoto Onuki
b1e0982173
Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
...
am: 50752f7391
2016-07-12 17:14:56 +00:00
Makoto Onuki
50752f7391
Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev
2016-07-12 17:09:32 +00:00
Mahaver Chopra
1f984d7f6b
Merge \\"Add an api to verify if ro.device_owner was set\\" into nyc-mr1-dev am: c1182a8128
...
am: 325af20235
2016-07-12 10:01:00 +00:00
Mahaver Chopra
325af20235
Merge \"Add an api to verify if ro.device_owner was set\" into nyc-mr1-dev
...
am: c1182a8128
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
b709dafb20
Merge \\\"Fix docs for DragEvent\\\" into nyc-dev am: b6fa207c67 am: 879b3fb9ce
...
am: dc4d435dde
2016-07-12 02:21:25 +00:00
Makoto Onuki
2afa465e2c
Merge \\"Handle package broadcasts before apps do\\" into nyc-mr1-dev am: ae13eee9c6
...
am: fcf7db9eed
2016-07-12 02:16:16 +00:00
Jeff Sharkey
1c93e205cf
Merge \\"Revert \\"Treat everyone the same.\\"\\" into nyc-mr1-dev am: 9dbc259b4f
...
am: 6e4fc19617
2016-07-12 02:16:08 +00:00
Tim Murray
b334d64371
Merge changes from topic \\'stune\\' into nyc-mr1-dev am: b646ec13e1
...
am: 6ab97e587e
2016-07-12 02:04:56 +00:00
Mark Lu
9204bedc4a
Merge \"Merge \\\"docs: fixed broken link in UsbManager javadocs\\\" into nyc-dev am: 162a6fad72 am: e67f00705f\" into nyc-mr1-dev-plus-aosp
...
am: 1a7791a1df
2016-07-12 02:02:44 +00:00
Makoto Onuki
5ddf510946
Merge \\"ShortcutManager javadoc\\" into nyc-mr1-dev am: 3746d2224d
...
am: d4255a9c95
2016-07-12 01:49:59 +00:00
Erik Kline
177c82be79
Support requesting async LinkProperties/NetworkCapabilities updates am: acdd639513
...
am: 915d09b5d4
2016-07-12 01:46:09 +00:00
Erik Kline
e357e238c9
Basic IPv6 Router Advertisement daemon am: a3ca6bd3e0
...
am: 461e4fff31
2016-07-12 01:46:01 +00:00
Doris Ling
531eb4e9f6
Merge \\"Add a secure setting for double twist gesture for camera flip.\\" into nyc-mr1-dev am: 3e869587e8
...
am: b8d3caf4b8
2016-07-12 01:32:40 +00:00
Selim Cinek
a6188916b9
Merge "resolve merge conflicts of 0483184 to master"
2016-07-12 01:26:52 +00:00
Selim Cinek
359c48c805
resolve merge conflicts of 0483184 to master
...
Change-Id: I8466c8d56b5685705591dad7cfb7d439b6dee3d7
2016-07-11 16:59:03 -07:00
Vladislav Kaznacheev
dc4d435dde
Merge \\"Fix docs for DragEvent\\" into nyc-dev am: b6fa207c67
...
am: 879b3fb9ce
2016-07-11 23:30:49 +00:00
Vladislav Kaznacheev
78004643e1
Merge \"Fix docs for DragEvent\" into nyc-dev
...
am: b6fa207c67
2016-07-11 23:26:31 +00:00
Vladislav Kaznacheev
879b3fb9ce
Merge \"Fix docs for DragEvent\" into nyc-dev
...
am: b6fa207c67
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
TreeHugger Robot
898cf235f0
Merge "Treat U+2695, U+2640, U+2642 as emoji characters."
2016-07-11 23:05:18 +00:00
Amith Yamasani
75db125ebb
Include new constant for encryption status in the getter's javadoc
...
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.
Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719
2016-07-11 15:02:18 -07:00
Makoto Onuki
fcf7db9eed
Merge \"Handle package broadcasts before apps do\" into nyc-mr1-dev
...
am: ae13eee9c6
2016-07-11 21:40:25 +00:00
Makoto Onuki
83f6d2da37
Throw ActivityNotFoundException when failed to launch shortcut
...
Originally the code used IIntentSender, but I had to switch to calling
startActivitiesInPackage() directly, because sendIntentSender() does
not support returning errors.
Bug 30035853
Change-Id: I5d7669c96a2f1805373c71aebf45b97ac1d01ff6
2016-07-11 14:37:18 -07:00
Jeff Sharkey
6e4fc19617
Merge \"Revert \"Treat everyone the same.\"\" into nyc-mr1-dev
...
am: 9dbc259b4f
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
Jorge Gil
f3fbe392d4
Merge "Add DOWNLOADS_BACKUP_ENABLED key to SettingsSecure"
2016-07-11 21:06:59 +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
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
2016-07-11 20:28:17 +00:00
Mark Lu
e67f00705f
Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
...
am: 162a6fad72
2016-07-11 20:20:39 +00:00
Mark Lu
3e15a43732
Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
...
am: 162a6fad72
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
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
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
Shubham Ajmera
807cf8699a
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
2016-07-11 12:15:24 +00:00
Erik Kline
915d09b5d4
Support requesting async LinkProperties/NetworkCapabilities updates
...
am: acdd639513
2016-07-11 11:01:42 +00:00
Erik Kline
461e4fff31
Basic IPv6 Router Advertisement daemon
...
am: a3ca6bd3e0
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
