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
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
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 0619545be9
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
Jeff Davidson
c2d75c898b
Merge "Fix runtime restart when using aggregated net observers." into nyc-dev
2016-06-20 16:56:15 +00:00
Jason Monk
ab17c98416
QS: Don't disable hotspot animation when leaving airplane mode
...
Change-Id: I80750e3c4d63e4d590b43e3ed595100e054e5b1e
Fixes: 29374561
2016-06-20 12:40:37 -04:00
Julia Reynolds
2d5c95f5b9
Merge "Don't reference variables before they are assigned." into nyc-dev
2016-06-20 16:40:31 +00:00
Joe Fernandez
13697b873c
docs: Narnia 2 advertising language update
...
b/29009702
Change-Id: Icd060074413c53d6ad24e2919dc80be949a2260c
2016-06-20 09:08:46 -07:00
Narayan Kamath
5ae42bb661
Merge "PackageManager: Don't fail app installs if dexopt fails." into nyc-dev
2016-06-20 15:19:31 +00:00
Robin Lee
6918675fa1
Remove @return from void API javadoc
...
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5
2016-06-20 14:53:58 +00:00
Julia Reynolds
370bca66e7
Don't reference variables before they are assigned.
...
Rare but technically possible.
Change-Id: I375cd1ac0bef5b6c7295618bef087554114c3cdd
Fixes: 29394773
2016-06-20 13:56:23 +00:00
Gustav Sennton
b088cb36b8
Use newly fetched PackageInfo for loading WebView code.
...
During a time window between the point at which a webview package
becomes updated and the WebViewUpdateService receiving an intent
declaring this action the WebViewUpdateService APIs will return a
PackageInfo pointing to an old and possibly removed WebView package.
This means that any paths that PackageInfo is referring to could have
been removed.
Currently, we set WebViewFactory.sPackageInfo using one of these APIs
and we might thus try to use deleted paths to to load WebView. This can
cause crashes, so instead fetch a fresh PackageInfo and assign
WebViewFactory.sPackageInfo to that.
Also early-out in loadWebViewNativeLibraryFromPackage if the current
package version doesn't match that of the one fetched from the
WebViewUpdateService.
Bug: 29381682
Change-Id: I2713ce2338a4a96c5317dcdbb363b424513088d5
2016-06-20 14:30:27 +01:00
Jason Monk
bd04ec31bd
Merge "QS: Fix missing tiles" into nyc-dev
2016-06-20 13:26:05 +00:00
Narayan Kamath
99407db8dd
PackageManager: Don't fail app installs if dexopt fails.
...
bug: 29493857
Change-Id: I953de204319b943d9389bb4c787f859e169e8d21
2016-06-20 13:35:27 +01:00
Shreyas Basarge
70b6cd903e
Merge "Fix for the missing sync bug" into nyc-dev
2016-06-20 09:17:21 +00:00
Chris Wren
fddf5df01f
Merge "assume a generous prior in the rate estimator" into nyc-dev
2016-06-18 19:28:18 +00:00
Selim Cinek
88086e7183
Fixed a stackoverflow in notifications
...
Change-Id: I29ce76593af81ad6e326d2e273fd872a4d9d4a89
Fixes: 29464060
2016-06-17 21:01:32 -07:00
Selim Cinek
e5ec413c13
Fixed a bug where a notification was incorrectly marked as removed
...
When unauto-bundled, it could lead to serious bugs on the lockscreen
and the header not being restored.
Change-Id: I2d6310a2bcb2f3a60402db5f1e522954f8bd0389
Fixes: 29463339
2016-06-17 20:04:16 -07:00
TreeHugger Robot
d11b5e6661
Merge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into nyc-dev
2016-06-18 02:07:05 +00:00
TreeHugger Robot
fc275d244e
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev
2016-06-18 02:01:00 +00:00
Sudheer Shanka
1796f6fa15
Add pm operation to set user restrictions.
...
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
2016-06-17 18:59:07 -07:00
Selim Cinek
a554c70738
Fixed a potential issue where a notification could be empty
...
Change-Id: Ic4b294092a47d30c469dfbd1eb6ab31208533b1c
Fixes: 29158425
2016-06-17 18:02:12 -07:00
Roozbeh Pournader
e977b0ae59
Mark Serbian in Latin script as non-localized [DO NOT MERGE]
...
Serbian in Latin script is only partially localized in Android N. We
should not show it as localized in either Setup Wizard or Settings.
Bug: 29460424
Change-Id: I6829a89c49c1b5e8768b1527daa3aa9508deb491
2016-06-17 17:34:13 -07:00
TreeHugger Robot
f4ddb7ce30
Merge "Fix a race in local settings caches" into nyc-dev
2016-06-18 00:30:28 +00:00
Andre Eisenbach
1bf8782605
Merge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev
2016-06-18 00:15:19 +00:00
TreeHugger Robot
838dfe60f0
Merge "Fix data race" into nyc-dev
2016-06-17 23:42:59 +00:00
Hemal Patel
ab5de09e7e
Docs: Changed sample link under Related Samples
...
Changed the Hello Compute sample link to point to Github Android Samples page
Bug: 28928053
Change-Id: I0673620f8beb03297b5dea0b50f4ddbd9d6e25db
2016-06-17 16:29:47 -07:00
Chris Tate
4eaaf7c8ff
Merge "Unspecified alarm worksource names are the rule, not the exception" into nyc-dev
2016-06-17 23:20:20 +00:00
