Bill Rassieur
84b6bb1826
am 6e78bb42: am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit '6e78bb42fc8af64f4f2208b48585451793e303c9':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:30:29 +00:00
Bill Rassieur
6e78bb42fc
am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:19:32 +00:00
Bill Rassieur
3de2d53a75
am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev
...
* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
Fix jank: Don't write lockout deadline if not needed
2015-09-28 23:09:10 +00:00
Bill Rassieur
c25d546050
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
2015-09-28 23:02:46 +00:00
Jorim Jaggi
e3e6d56b94
Fix jank: Don't write lockout deadline if not needed
...
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.
Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
2015-09-28 13:57:37 -07:00
Adam Lesinski
f4a09907e9
am 983c6d4d: am b8126531: am d913782f: am d5f10154: Bump BatteryStats version
...
* commit '983c6d4d39265346a088174482f1f0dc55c0ca31':
Bump BatteryStats version
2015-09-28 07:19:32 +00:00
Adam Lesinski
983c6d4d39
am b8126531: am d913782f: am d5f10154: Bump BatteryStats version
...
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
Bump BatteryStats version
2015-09-28 07:12:49 +00:00
Adam Lesinski
d913782f1b
am d5f10154: Bump BatteryStats version
...
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
Bump BatteryStats version
2015-09-28 07:00:52 +00:00
Adam Lesinski
d5f10154c7
Bump BatteryStats version
...
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
2015-09-27 21:28:43 +00:00
Todd Kennedy
56ebb25708
resolved conflicts for 389bb7f5 to master
...
Change-Id: I9c3474577166cc91c50d32d225957fbd13c205bf
2015-09-25 15:57:11 -07:00
Todd Kennedy
389bb7f509
am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master
...
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
Pass dexopt flags as integer
2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444
resolved conflicts for 7de7e0b0 to stage-aosp-master
...
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Oren Blasberg
b8c7ef5eaf
Merge "Make context menus show as popup menus."
2015-09-25 21:09:18 +00:00
Todd Kennedy
fa54ab7950
Pass dexopt flags as integer
...
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Oren Blasberg
ed3912692f
Make context menus show as popup menus.
...
This means that right-clicking/long pressing on a view that is registered for
context menu will show the context menu as a popup menu instead.
Bug: 20016398
Change-Id: I96fea60435fff2f981d288521f490f8ff24ada15
2015-09-25 12:01:01 -07:00
Jorim Jaggi
fc832e3ef2
resolved conflicts for c594e935 to master
...
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Jorim Jaggi
c594e9354a
am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Wale Ogunwale
a5ffea3b7d
Revert "Fix leaking the first activity while preserving windows."
...
This reverts commit 640a3909a3
2015-09-25 09:01:22 -07:00
Jorim Jaggi
b7b9b31f69
am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc
Deliver camera launch source for analytics
...
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Todd Kennedy
4e32174517
resolved conflicts for cafacef6 to stage-aosp-master
...
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
2015-09-24 14:34:06 -07:00
Oren Blasberg
8f3976c875
Merge "Cascading submenus: Fix a few small issues."
2015-09-24 20:59:44 +00:00
Oren Blasberg
734320d06b
Cascading submenus: Fix a few small issues.
...
1. Open submenus now disappear instantly rather than fading out when
mouse hovers over a non-submenu item.
2. When a submenu is opened on hover, the item that was hovered now
will remain selected instead of being deselected.
3. Fix an issue where if the same chain of submenus was opened more
than once, the submenus could open in a different direction each
time. To fix, we keep track of the direction of opening along the way
and make sure to reset the preferred direction when a submenu is
closed.
Bug: 20127825
Change-Id: I99972cce4ddabe316c5148f1dd79a5d7b3e64b87
2015-09-24 13:36:15 -07:00
Andreas Gampe
55fe944f98
Frameworks/base: Propagate boot status to installd
...
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug: 23898216
(cherry picked from commit 06bb908b78
2015-09-24 12:27:25 -07:00
Abodunrinwa Toki
b9acbe40d2
Reduce delay of floating toolbar appearance.
...
Bug: 21956394
Change-Id: Ide7ee2daffbf618b0a483c377032bf25b20d5b8e
2015-09-24 16:58:08 +00:00
Makoto Onuki
7c7ad1a204
Merge "Make DPM/DPMS unit-testable"
2015-09-22 21:17:23 +00:00
Adam Lesinski
d548da7991
am 112c1dc6: am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit '112c1dc63adbc36b1bd50dac24d1ea39959ef0f2':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 20:57:50 +00:00
Andreas Gampe
bc68463602
resolved conflicts for 5d7b68d4 to master
...
Change-Id: I6f56e8e11c35733f8d84346ca2b9a201784552e1
2015-09-22 13:41:39 -07:00
Elliott Hughes
cdda4f1070
am 776fa57b: am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
...
* commit '776fa57b2da75fb508d66cf0339dc7c4df9a5e55':
WrapperInit: remove dead execStandalone method
2015-09-22 20:04:29 +00:00
Makoto Onuki
cc4bbeb76a
Make DPM/DPMS unit-testable
...
- Now all services that DPMS uses are injectable.
- Introduce some wrappers to make static methods and final class mockable.
(e.g. for Binder.getCallingUid())
- In unit tests we replace those with Mockito mocks, except we use a partial
mock for PackageManager, because we use way too many methods of this and
most of them are okay to use directly.
- To install a partial mock to PackageManager, I needed to make
ApplicationPackageManager @hide public non-final.
- For a starter, added tests for DPM.setAmin().
Bug 24061108
Change-Id: I2afd51d8bc0038992d5f9be38c686260be775b75
2015-09-22 12:47:44 -07:00
Adam Lesinski
112c1dc63a
am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:58:50 +00:00
Andreas Gampe
5d7b68d491
am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
...
* commit '53ed452e86aa186b5903b65057b4473629292f0d':
Frameworks/base: Propagate boot status to installd
2015-09-22 18:54:19 +00:00
Adam Lesinski
dbca76cda1
am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:42:33 +00:00
Andreas Gampe
9ce68b2444
am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
...
* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
Frameworks/base: Propagate boot status to installd
2015-09-22 18:36:43 +00:00
Adam Lesinski
1b57758a1b
Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
2015-09-22 18:33:14 +00:00
Elliott Hughes
776fa57b2d
am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
...
* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
WrapperInit: remove dead execStandalone method
2015-09-22 15:50:09 +00:00
Elliott Hughes
aa31169804
am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
...
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Alan Viverette
31cb4bb41f
Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"
2015-09-22 13:48:04 +00:00
Adam Lesinski
52290c9c4f
Fix Array Index Out of Bounds in BatteryStatsImpl
...
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.
Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78
Frameworks/base: Propagate boot status to installd
...
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-21 15:16:13 -07:00
Daniel Micay
13eac10a26
WrapperInit: remove dead execStandalone method
...
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a
2015-09-21 18:14:56 -04:00
Adam Lesinski
ee5584cd3c
am eb1356cc: am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
...
* commit 'eb1356cc15d4c07e152b5dbc545701c496d7b50f':
Fix crash when no power_profile is specified
2015-09-19 15:35:09 +00:00
Adam Lesinski
eb1356cc15
am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
...
* commit '3bdbda780613e1701e4e3e567be8a743a8dedb8f':
Fix crash when no power_profile is specified
2015-09-19 00:23:02 +00:00
Adam Lesinski
dd0238ec7d
am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
...
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
Fix crash when no power_profile is specified
2015-09-18 22:21:31 +00:00
Adam Lesinski
e54253bdd3
Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
2015-09-18 22:15:19 +00:00
Adam Lesinski
8057133d49
Fix crash when no power_profile is specified
...
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.
Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
2015-09-18 14:56:34 -07:00
Adam Lesinski
36743412ac
am 4092eeb7: am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
...
* commit '4092eeb7f7b079a87c4583c713c0e6d2e208b3c4':
BatteryStats: Better big-little CPU accounting
2015-09-18 21:08:52 +00:00
Adam Lesinski
4092eeb7f7
am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
...
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
BatteryStats: Better big-little CPU accounting
2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667
am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
...
* commit '680553957e4ff47343334881c34de6969b2ed977':
BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e
Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
2015-09-18 20:26:07 +00:00
