Sudheer Shanka
7aecaf8d52
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
...
am: f00e780472
2016-06-20 22:43:21 +00:00
smain@google.com
b595fdc0e9
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
...
am: db4ef3f4f8
2016-06-20 22:40:24 +00:00
Selim Cinek
ce87a8af9d
Fixed an issue where the deleteintent of children wasn't sent
...
Especially in context of autobundling this could lead to bad bugs
Change-Id: Idf722f9675f6f6e49d49c08798e38e09b1c5c01e
Fixes: 29515621
2016-06-20 15:40:07 -07:00
Sudheer Shanka
f00e780472
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev
2016-06-20 22:38:51 +00:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:49 +00:00
Scott Main
db4ef3f4f8
Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev
2016-06-20 22:28:57 +00:00
smain@google.com
d98ba4c3b2
just a reorg of some links to put all Android Studio help button redirects together
...
Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6
2016-06-20 15:25:56 -07:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +00:00
Dianne Hackborn
61923ced0c
Merge \"Fix issue #29438842 : Enter the \"am broadcast -a...\" into nyc-dev
...
am: d2480ab7bb
2016-06-20 22:18:29 +00:00
Dianne Hackborn
d2480ab7bb
Merge "Fix issue #29438842 : Enter the "am broadcast -a..." into nyc-dev
2016-06-20 22:09:30 +00:00
Hemal Patel
40f8005156
Docs: Changed sample link under Related Samples am: ab5de09e7e am: d5af0a1214
...
am: 2a3336813a
2016-06-20 22:04:48 +00:00
Antonio Cansado
f704837429
Fix infinite loop when registering data usage callback.
...
Trivial fix is to call the method that takes the handler as a param.
Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Hemal Patel
2a3336813a
Docs: Changed sample link under Related Samples am: ab5de09e7e
...
am: d5af0a1214
2016-06-20 22:01:02 +00:00
Adrian Roos
fb95a81a8b
Allow trust agents to run during provisioning
...
Fixes a bug where trust agents weren't able to run during
provisioning, because user presence is only acknowledged after
provisioning completed.
Change-Id: Ib9ed235e8372555fdc40eefd0fc6b1192613abda
Fixes: 29231515
2016-06-20 14:59:02 -07:00
Hemal Patel
d5af0a1214
Docs: Changed sample link under Related Samples
...
am: ab5de09e7e
2016-06-20 21:53:54 +00:00
Roozbeh Pournader
1f2f328025
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
...
am: 160126e2d8
2016-06-20 21:44:50 +00:00
Roozbeh Pournader
160126e2d8
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
2016-06-20 21:39:22 +00:00
Hall Liu
7e62bf065c
Merge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169 am: edace5e820 -s ours
...
am: f184789ae9
2016-06-20 21:37:51 +00:00
Hall Liu
f184789ae9
Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169
...
am: edace5e820
2016-06-20 21:31:36 +00:00
Hall Liu
edace5e820
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am: fc32ec1aef am: aeba34533c
...
am: 317d0cb169
2016-06-20 21:28:09 +00:00
Wale Ogunwale
f929560813
Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
...
am: beaf3707fa
2016-06-20 21:23:20 +00:00
Hall Liu
317d0cb169
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
...
am: aeba34533c
2016-06-20 21:21:25 +00:00
Wale Ogunwale
089586fd91
Don't re-launch stopped activities while the device is sleeping
...
Don't ensure configuration for stopped activities while the device
is sleeping as we don't want to relaunch activities in this state.
Note that the right configuration will be applied to the activity
the next time we try to make it visible. The re-launch will happen
then.
Bug: 28518380
Change-Id: Id79d7817ba8f213d89cae6964de09cafe17481f9
2016-06-20 14:16:22 -07:00
Hall Liu
aeba34533c
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
...
am: fc32ec1aef
2016-06-20 21:15:42 +00:00
TreeHugger Robot
beaf3707fa
Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
2016-06-20 21:11:05 +00:00
Joe Fernandez
7222e897a9
Revert "Revert "docs: Add Videos section to N Preview landing page""
...
This reverts commit 3460516d20
2016-06-20 21:10:03 +00:00
Hall Liu
fc32ec1aef
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
2016-06-20 21:04:43 +00:00
Steve McKay
92e64a65ee
Merge \"Make advanced storage option sticky...\" into nyc-dev
...
am: 361ccf5eef
2016-06-20 20:53:11 +00:00
TreeHugger Robot
361ccf5eef
Merge "Make advanced storage option sticky..." into nyc-dev
2016-06-20 20:45:04 +00:00
Mady Mellor
53ac1ef993
Don't show the shade background for heads up notifications
...
This looked weird when dismissing.
Change-Id: I9c4256a4c8792c4ff81d3cf1e34c45591853c206
Fixes: 29462609
2016-06-20 13:27:02 -07:00
Joe Fernandez
c7fd306a78
Merge \"docs: Narnia 2 advertising language update\" into nyc-dev
...
am: ebad16f3c0
2016-06-20 20:22:08 +00:00
Joe Fernandez
ebad16f3c0
Merge "docs: Narnia 2 advertising language update" into nyc-dev
2016-06-20 20:13:09 +00:00
Adam Lesinski
145e50243e
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
2016-06-20 19:49:46 +00:00
Chad Brubaker
9f779ab4af
Add getApplicationConfigForPackage
...
getApplicationConfigForPackage will be used by system components that
need to make connections for apps, e.g. DownloadManager, so that their
secure connections have the same configuration as those from the app
itself.
Bug: 29505888
Change-Id: Idf1cac6307431911eda34529d3fd50f9ca0da314
2016-06-20 12:40:20 -07:00
Selim Cinek
20aafe81f9
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
...
am: 3952c3a2d4
2016-06-20 19:21:56 +00:00
Selim Cinek
3952c3a2d4
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
...
* changes:
Fixed a stackoverflow in notifications
Fixed a bug where a notification was incorrectly marked as removed
Fixed a potential issue where a notification could be empty
Fixed a bug where the expanded layout would flash
2016-06-20 19:11:50 +00:00
John Stultz
331e5a1541
Merge \\"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\\" am: cf81fdb37b
...
am: 8fb95f0fb3
2016-06-20 19:11:02 +00:00
Bill Yi
59d0470a64
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: f5314e3b75
2016-06-20 19:06:59 +00:00
Bill Yi
ddc101ee51
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: a69a9bdc1f
2016-06-20 19:06:53 +00:00
John Stultz
8fb95f0fb3
Merge \"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\"
...
am: cf81fdb37b
2016-06-20 19:05:57 +00:00
Steve McKay
dd27444fa8
Make advanced storage option sticky...
...
...when used from one of the picker modes.
Bug: 29454465
Change-Id: I5f7db04a51023b59121289afd300a13ea071146d
2016-06-20 11:57:19 -07:00
David Brazdil
72ea5eeb61
Merge \"Fix NPE in reading package-usage.list file\" into nyc-dev
...
am: ec3f8409b8
2016-06-20 18:52:46 +00:00
Jason Monk
e91051b206
Merge \"QS: Don\'t disable hotspot animation when leaving airplane mode\" into nyc-dev
...
am: 8c9b6609f1
2016-06-20 18:52:40 +00:00
Treehugger Robot
cf81fdb37b
Merge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages"
2016-06-20 18:44:17 +00:00
TreeHugger Robot
ec3f8409b8
Merge "Fix NPE in reading package-usage.list file" into nyc-dev
2016-06-20 18:38:46 +00:00
Bill Yi
f5314e3b75
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-20 18:36:25 +00:00
Bill Yi
a69a9bdc1f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-20 18:35:59 +00:00
Jason Monk
8c9b6609f1
Merge "QS: Don't disable hotspot animation when leaving airplane mode" into nyc-dev
2016-06-20 18:34:17 +00:00
Gustav Sennton
deac870fd1
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:44 +00:00
