drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,194 Commits 1 Branch 0 Tags
Commit Graph

245194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sreevanis
5fef4a7d44 Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs 
am: 07340a654a

Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
 2016-06-21 11:50:22 +00:00
Sreevani Sreejith
07340a654a Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs 2016-06-21 11:44:20 +00:00
sreevanis
0c820aa9e1 Documented how to handle advertisements during audio playback. 
Bug:24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
 2016-06-21 04:41:33 -07:00
Bill Yi
1fbf42ce30 Import translations. DO NOT MERGE 
Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import
 2016-06-21 00:53:23 -07:00
Bill Yi
dafd8ad2cf Import translations. DO NOT MERGE 
Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import
 2016-06-21 00:24:26 -07:00
Andrii Kulian
9980514ee0 Merge "Compare intent filter when launching adjacent" into nyc-dev 2016-06-21 05:18:00 +00:00
TreeHugger Robot
8a1bc54ab0 Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev 2016-06-21 02:56:38 +00:00
Felipe Leme
ee27cabe34 Ignore system apps on enforceMeteredApnPolicy(). 
BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
 2016-06-20 17:15:46 -07:00
Jeremie GARCIA
02708b1ac4 Parse "vendor/priv-app" to find privileged applications 
Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug: 29488499
 2016-06-20 16:43:56 -07:00
TreeHugger Robot
f159b74608 Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev 2016-06-20 23:03:46 +00:00
Wei Jia
bd45be5032 Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev 2016-06-20 22:58:34 +00:00
Wei Jia
ce4957eb37 MediaPlayer: fix java doc for setPlaybackParams. 
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
 2016-06-20 15:57:23 -07:00
Robert Carr
07421cb9bb Don't try and resolve WRAP_CONTENT too early. 
At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
 2016-06-20 15:55:02 -07: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
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
d2480ab7bb Merge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev 2016-06-20 22:09:30 +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

Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
 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

Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
 2016-06-20 21:53:54 +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
f184789ae9 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

Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
 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

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
 2016-06-20 21:28:09 +00:00
Hall Liu
317d0cb169 Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef 
am: aeba34533c

Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
 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

Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
 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
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
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
ebad16f3c0 Merge "docs: Narnia 2 advertising language update" into nyc-dev 2016-06-20 20:13:09 +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
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
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
TreeHugger Robot
ec3f8409b8 Merge "Fix NPE in reading package-usage.list file" into nyc-dev 2016-06-20 18:38:46 +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
Dianne Hackborn
ea05cd57f5 Fix issue #29438842: Enter the "am broadcast -a... 
...'android.hardware.action.NEW_PICTURE'" to terminal, but does not have a response.

Change-Id: I264f386810237a7abc767f68363afeccda557b9c
 2016-06-20 11:22:40 -07:00
Gustav Sennton
cdbf412f8e Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev 2016-06-20 18:17:06 +00:00
Wale Ogunwale
60920d5aa1 Revert "Don't re-launch activities while the device is sleeping" 
This reverts commit 0619545be9adca4458cb627c18c211faad6b6275.

Bug: 29497152
Bug: 28518380
Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91
 2016-06-20 11:11:28 -07:00
Sudheer Shanka
3b2297d05f Allow call addSharedAccountsFromParentUser with CREATE_USERS permission. 
Bug: 29189712
Bug: 29500492
Change-Id: I0fca4951d41c14aa1739e01ca15d674b86a15d7c
 2016-06-20 18:11:26 +00:00
Chong Zhang
7c6692646c Merge "Make sure fontScale in configuration sent to app is equal to global" into nyc-dev 2016-06-20 18:02:51 +00:00
Adrian Roos
e416a4200a Merge "SystemUI: Override notification app name" into nyc-dev 2016-06-20 18:00:04 +00:00
Adam Lesinski
f9b20a9ec4 BatteryStats: record best estimated battery capacity 
Using the coulomb counter, record the estimated max battery
capacity.

Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
 2016-06-20 10:58:37 -07:00
Chong Zhang
6be533ef6c Make sure fontScale in configuration sent to app is equal to global 
We don't want the default value 1.0 from empty config to be applied
as an override.

bug: 29367672
Change-Id: Ia9947c24fa9435ba5b208eb9bd05e0b07b574015
 2016-06-20 10:55:03 -07:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
David Brazdil
83dce3642a Fix NPE in reading package-usage.list file 
A zero-length file is a valid package usage file of version 0 but
checking against the version 1 magic would throw a NPE.

Bug: 29491065
Change-Id: Ie54b1dd3218e4b1251c29db0c784a5ddf605394f
 2016-06-20 17:56:25 +01:00