Adam Lesinski
873bf2c48f
am 9986350d: am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
...
* commit '9986350d66b6106cabe8c017455561f52a727f2c':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
2015-06-30 21:54:33 +00:00
Adam Lesinski
9986350d66
am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
...
* commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
2015-06-30 21:40:24 +00:00
Adam Lesinski
32ddd53466
Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
2015-06-30 20:30:46 +00:00
Svet Ganov
fc72ce8bbd
am 49316d83: am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
...
* commit '49316d83d518110c64fab92c423ebd263ee3b7cf':
Installer is a part of the system with unrevocable permissions
2015-06-30 19:56:47 +00:00
Adam Lesinski
43f222f02f
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
...
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
2015-06-30 12:54:41 -07:00
Svet Ganov
49316d83d5
am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
...
* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
Installer is a part of the system with unrevocable permissions
2015-06-30 19:44:27 +00:00
Svet Ganov
4a23ac4589
Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
2015-06-30 19:24:05 +00:00
Maxim Bogatov
16f3e55df8
am b0c1485d: am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev
...
* commit 'b0c1485d4119e87507093892e0b1d96f777f5c55':
Let TextView clear accessibility selection index
2015-06-30 19:19:29 +00:00
Maxim Bogatov
b0c1485d41
am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev
...
* commit '24815124600a12a9a0ef1d7a8883ab2c8e5c1525':
Let TextView clear accessibility selection index
2015-06-30 19:07:50 +00:00
Maxim Bogatov
7a2e4b8f80
Merge "Let TextView clear accessibility selection index" into mnc-dev
2015-06-30 18:45:52 +00:00
Chris Wren
dd06e383ec
am 8cc9473f: am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev
...
* commit '8cc9473fff87c184068a3b773c45d1d4c6669fcc':
add more power manager metrics
2015-06-30 17:57:14 +00:00
Chris Wren
8cc9473fff
am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev
...
* commit '699d2f787a8e9fbfcb819f2fb2aaba4c4eb48440':
add more power manager metrics
2015-06-30 17:43:13 +00:00
Abodunrinwa Toki
9b1b7f9c23
am 0707edf1: am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
...
* commit '0707edf1a82fa99c61a87628be45ab0d78bbd717':
Fix Floating toolbar overflow width.
2015-06-30 17:37:25 +00:00
Abodunrinwa Toki
22f4864759
am 3e26dcb5: am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
...
* commit '3e26dcb5506999529891892c5716afede85895a4':
Fix floating toolbar flicker in ExtractEditText mode.
2015-06-30 17:37:18 +00:00
Svet Ganov
3fc85e6f1a
am fb498a31: am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev
...
* commit 'fb498a311df525953900c0a186d3765e3a37ac56':
Add read/write external storage app ops
2015-06-30 17:37:04 +00:00
Abodunrinwa Toki
0707edf1a8
am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
...
* commit '0468a5700e2c0112d908fac3d791477192c91a81':
Fix Floating toolbar overflow width.
2015-06-30 17:23:46 +00:00
Abodunrinwa Toki
3e26dcb550
am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
...
* commit '5239997d646cb3e5d146db3794e7015f35943fa1':
Fix floating toolbar flicker in ExtractEditText mode.
2015-06-30 17:23:41 +00:00
Svet Ganov
fb498a311d
am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev
...
* commit 'c5c8995510943527f99e51b04809dae090f0c2ab':
Add read/write external storage app ops
2015-06-30 17:23:30 +00:00
Chris Wren
392527c4cc
Merge "add more power manager metrics" into mnc-dev
2015-06-30 17:20:29 +00:00
Svet Ganov
6a166af8fd
Installer is a part of the system with unrevocable permissions
...
1. Mark the installer permissions as not revocable.
2. Make the permission result dispatch more robust to handle installer death.
bug:22012614
Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
2015-06-30 10:15:49 -07:00
Abodunrinwa Toki
e40d7a6326
Merge "Fix Floating toolbar overflow width." into mnc-dev
2015-06-30 16:56:23 +00:00
Abodunrinwa Toki
685a14468e
Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
2015-06-30 16:53:26 +00:00
Svet Ganov
b24ff7e03a
Merge "Add read/write external storage app ops" into mnc-dev
2015-06-30 16:50:17 +00:00
George Mount
19accae7b3
am 7f8f9e5b: am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
...
* commit '7f8f9e5b1372d44caf94186b4dfeaaa508a4b216':
Fix FragmentTransaction replace() behavior
2015-06-30 14:57:46 +00:00
George Mount
7f8f9e5b13
am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
...
* commit 'aa315dbb361e447b6442efc562b41d9b6fedf4e4':
Fix FragmentTransaction replace() behavior
2015-06-30 14:45:46 +00:00
George Mount
0303d9ce70
Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
2015-06-30 14:21:49 +00:00
Chris Wren
9bb290bcc3
add more power manager metrics
...
dream start/stop
dream duration
screen timeout setting
Bug: 21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
2015-06-30 10:10:24 -04:00
Kenny Guy
679a5af472
am 2b3eccae: am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev
...
* commit '2b3eccaec6eb43530d3a693ffe9310031e05e592':
Deprecate APIs for admin to create users.
2015-06-30 13:36:49 +00:00
Kenny Guy
2b3eccaec6
am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev
...
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
Deprecate APIs for admin to create users.
2015-06-30 13:25:21 +00:00
Kenny Guy
31659c253e
Merge "Deprecate APIs for admin to create users." into mnc-dev
2015-06-30 13:03:32 +00:00
Billy Lau
28aad8efe6
am 67dfa491: am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
...
* commit '67dfa49194cf91241ff791730bacb71e07530ef3':
Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 10:12:46 +00:00
Esteban Talavera
c4bb8de0d2
am 283b7ace: am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
...
* commit '283b7ace805d9afd972cccf906a241c34761c7af':
Marking some globals from setGlobalSetting as not supported
2015-06-30 10:12:40 +00:00
Billy Lau
67dfa49194
am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
...
* commit 'e4c3fd725ea8870756428a6580052a34fc676299':
Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 09:56:15 +00:00
Esteban Talavera
283b7ace80
am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
...
* commit '37fd8bd182c110b98772876f3fa47cc4d54042bc':
Marking some globals from setGlobalSetting as not supported
2015-06-30 09:56:10 +00:00
Benjamin Franz
932765b45b
am aa2b7910: am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev
...
* commit 'aa2b79107918adfe2fbfc7d40dd17845b4739999':
Make ContentObservers work across profiles
2015-06-30 09:47:14 +00:00
Billy Lau
f62f4c94a3
Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
2015-06-30 09:05:34 +00:00
Esteban Talavera
fef8cbd6a6
Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
2015-06-30 08:55:38 +00:00
Benjamin Franz
aa2b791079
am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev
...
* commit 'adb41d8f6cfb2f33240c11cc6850994579952ea1':
Make ContentObservers work across profiles
2015-06-30 08:00:48 +00:00
Benjamin Franz
01b079f7d2
Merge "Make ContentObservers work across profiles" into mnc-dev
2015-06-30 07:45:50 +00:00
Erik Kline
476501875b
am f2a08d05: am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev
...
* commit 'f2a08d054cdc301eb66c957f9ae05307d1e1f215':
Fix use of reachable DNS server logic
2015-06-30 07:06:06 +00:00
Erik Kline
f2a08d054c
am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev
...
* commit '49aeed9f3fe7d8e7af2fff549587546dfe4361d1':
Fix use of reachable DNS server logic
2015-06-30 06:55:42 +00:00
Erik Kline
5f950417f6
Merge "Fix use of reachable DNS server logic" into mnc-dev
2015-06-30 06:32:23 +00:00
Andreas Gampe
60b5cabb4c
am 9958e75b: am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
...
* commit '9958e75b51029fca7bd130e37c5d5b3ca24e2788':
Frameworks/base: Remove UsageEvents finalizer
2015-06-30 06:12:40 +00:00
Andreas Gampe
9958e75b51
am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
...
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
Frameworks/base: Remove UsageEvents finalizer
2015-06-30 05:58:53 +00:00
Andreas Gampe
6feb4301eb
Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
2015-06-30 05:40:08 +00:00
Andreas Gampe
373fb40947
Frameworks/base: Remove UsageEvents finalizer
...
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.
Bug: 22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
2015-06-29 22:07:30 -07:00
Svet Ganov
921c7dfc80
Add read/write external storage app ops
...
bug:22104418
Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
2015-06-29 21:51:45 -07:00
Abodunrinwa Toki
8747f37383
Fix Floating toolbar overflow width.
...
Also clean out unused methods.
Bug: 22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
2015-06-29 21:17:22 -07:00
Abodunrinwa Toki
1b57653b50
Fix floating toolbar flicker in ExtractEditText mode.
...
Fixed by making sure to update visibility immediately after setting a
hide flag on the FloatingToolbarVisibilityHelper.
Bug: 22101632
Change-Id: Iea2d9786c14f6451da836e55f0d880025aa00ed2
2015-06-29 20:43:14 -07:00
Erik Kline
b36a3131d1
Fix use of reachable DNS server logic
...
Move reachable DNS server computation out of ConnectivityService
and split it into LinkProperties#isReachable() and a companion
change in WifiStateMachine's makeLinkProperties().
Restore previous ConnectivityService#updateDnses() behaviour, as
the pruning is done in WifiStateMachine now.
Bug: 19470192
Bug: 20733156
Bug: 22098233
Change-Id: I810ef74d504e5dc1ca2017d435cdadd6b82171e6
2015-06-30 12:12:37 +09:00