git.osdn.net Git - android-x86/frameworks-base.git/log

Adam Lesinski [Fri, 15 May 2015 23:33:16 +0000 (23:33 +0000)]

am 7fb55c66: am e171e34e: am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

* commit '7fb55c66b52752d5a3ac909709e9ad0c78bc613e':
BatteryStats: Enable bluetooth energy collection

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 23:21:58 +0000 (23:21 +0000)]

am e171e34e: am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

* commit 'e171e34e63bbeea790cb6c5191873fc181d1b5c0':
BatteryStats: Enable bluetooth energy collection

commit | commitdiff | tree

Zach Johnson [Fri, 15 May 2015 23:20:34 +0000 (23:20 +0000)]

am 85f82784: am 4b197204: am a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

* commit '85f82784f88a6bd2a94ee5bf44b8d105bcb1671b':
Create unified BIND_CARRIER_SERVICES permission

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 23:05:52 +0000 (23:05 +0000)]

am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

* commit '18f84162fea083fdc958323cf41352637f3df22f':
BatteryStats: Enable bluetooth energy collection

commit | commitdiff | tree

Zach Johnson [Fri, 15 May 2015 23:05:41 +0000 (23:05 +0000)]

am 4b197204: am a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

* commit '4b19720453de5a293104db9a5a415a4974b2982b':
Create unified BIND_CARRIER_SERVICES permission

commit | commitdiff | tree

Paul Mclean [Fri, 15 May 2015 22:59:52 +0000 (22:59 +0000)]

am a53b87c9: am bb2387bd: am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

* commit 'a53b87c918ea0b3c4348f4b1d0943b966df9b39e':
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:59:47 +0000 (22:59 +0000)]

am d03ed00c: am b50a8b97: am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

* commit 'd03ed00c6761d20a3581c133d8cf639c03b4d889':
Return correct year in DayPickerPagerAdapter.getYearForPosition()

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:59:42 +0000 (22:59 +0000)]

am 4de86f85: am f0d40256: am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

* commit '4de86f85f9ae6eaabc69600547b3b9dff5b6d879':
Allow getChangingConfigurations() on DrawableWrapper with null drawable

commit | commitdiff | tree

Paul Lawrence [Fri, 15 May 2015 22:59:38 +0000 (22:59 +0000)]

am 8e16c38f: am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit '8e16c38f35628e27c1ddd9cf5d0d097e1f7bcfa0':
DOn't save encryption settings when not encrypted

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:57:01 +0000 (22:57 +0000)]

Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

commit | commitdiff | tree

Zach Johnson [Fri, 15 May 2015 22:52:20 +0000 (22:52 +0000)]

am a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

* commit 'a80282a73385f42be4c2e730690838c92f2870ae':
Create unified BIND_CARRIER_SERVICES permission

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:49:24 +0000 (15:49 -0700)]

BatteryStats: Enable bluetooth energy collection

Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21

commit | commitdiff | tree

Paul Mclean [Fri, 15 May 2015 22:48:13 +0000 (22:48 +0000)]

am bb2387bd: am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

* commit 'bb2387bd3f715e1ecc9aed6555519d769e1f4631':
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:48:09 +0000 (22:48 +0000)]

am b50a8b97: am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

* commit 'b50a8b97da15e275411198d07d0d6ae0c548b779':
Return correct year in DayPickerPagerAdapter.getYearForPosition()

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:48:05 +0000 (22:48 +0000)]

am f0d40256: am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

* commit 'f0d40256b89222687d9abcde87d01c4fc45eefe1':
Allow getChangingConfigurations() on DrawableWrapper with null drawable

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:48:05 +0000 (22:48 +0000)]

am 89d1f707: am 47247e72: am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage list" into mnc-dev

* commit '89d1f707488a797455a94fb8dfd040cd26c1a33f':
BatteryStatsHelper: Bluetooth wasn't being included in usage list

commit | commitdiff | tree

Paul Lawrence [Fri, 15 May 2015 22:48:00 +0000 (22:48 +0000)]

am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit 'edc3fbb90619eb89da7db5cf1c76026a19a2ac98':
DOn't save encryption settings when not encrypted

commit | commitdiff | tree

Jeff Tinker [Fri, 15 May 2015 22:47:59 +0000 (22:47 +0000)]

am 2d33fbeb: am 922bdb1b: am 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev

* commit '2d33fbeb13ae853cc22e4318f3db28f5da76f6f7':
MediaDrm API Updates per api council review

commit | commitdiff | tree

Paul McLean [Fri, 15 May 2015 22:47:54 +0000 (22:47 +0000)]

am abe665cf: am 46f7c233: am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

* commit 'abe665cf2ed2be269212307ab4aa67dc1e268041':
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java

commit | commitdiff | tree

Zach Johnson [Fri, 15 May 2015 22:40:26 +0000 (22:40 +0000)]

Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:37:37 +0000 (22:37 +0000)]

am 28d7cfcb: am e12fe8cd: am 2177ed40: Merge changes from topic \'bench\' into mnc-dev

* commit '28d7cfcb0a2cf7684b1ce0597f98d8d7f7daaa94':
Command to change force adoptable state.
Initial pass at storage benchmarks.

commit | commitdiff | tree

Paul Mclean [Fri, 15 May 2015 22:33:45 +0000 (22:33 +0000)]

am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

* commit '0844dcd07034699f3edb0bab4a2ddfc97cc9a25c':
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:33:40 +0000 (22:33 +0000)]

am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

* commit '1ac88088adf54be60c12ec80c3533ee586eee02f':
Return correct year in DayPickerPagerAdapter.getYearForPosition()

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:33:36 +0000 (22:33 +0000)]

am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

* commit '6044798ef7426078838e292c1459d42c69e115b7':
Allow getChangingConfigurations() on DrawableWrapper with null drawable

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:33:31 +0000 (22:33 +0000)]

am 47247e72: am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage list" into mnc-dev

* commit '47247e728abb6bee77e2f650b9a339cdd55ddc29':
BatteryStatsHelper: Bluetooth wasn't being included in usage list

commit | commitdiff | tree

Paul Lawrence [Fri, 15 May 2015 22:33:31 +0000 (22:33 +0000)]

am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev

* commit '21c8a4930630d9f0a4b0dc3d56534b0b30bb0851':
DOn't save encryption settings when not encrypted

commit | commitdiff | tree

Jeff Tinker [Fri, 15 May 2015 22:33:26 +0000 (22:33 +0000)]

am 922bdb1b: am 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev

* commit '922bdb1ba3f25faa78f56a17de29d3307106dea5':
MediaDrm API Updates per api council review

commit | commitdiff | tree

Paul McLean [Fri, 15 May 2015 22:33:22 +0000 (22:33 +0000)]

am 46f7c233: am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

* commit '46f7c233ec2edbefe4cb3728871f3dcc0537d9fd':
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java

commit | commitdiff | tree

Paul Mclean [Fri, 15 May 2015 22:28:31 +0000 (22:28 +0000)]

Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

commit | commitdiff | tree

Paul Mclean [Fri, 15 May 2015 22:28:07 +0000 (22:28 +0000)]

Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"

This reverts commit 34f5e042904c22643f96d4466caa003073708b62.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:25:39 +0000 (22:25 +0000)]

Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 22:25:25 +0000 (22:25 +0000)]

Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:22:32 +0000 (22:22 +0000)]

am e12fe8cd: am 2177ed40: Merge changes from topic \'bench\' into mnc-dev

* commit 'e12fe8cd98341f79487843b1e35113e7577298a2':
Command to change force adoptable state.
Initial pass at storage benchmarks.

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:22:31 +0000 (22:22 +0000)]

am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage list" into mnc-dev

* commit 'ce27996c4fe665e88222bb913060d8de991ede4f':
BatteryStatsHelper: Bluetooth wasn't being included in usage list

commit | commitdiff | tree

Jeff Tinker [Fri, 15 May 2015 22:22:26 +0000 (22:22 +0000)]

am 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev

* commit '7020a1377a65fb7f61a5bd36c254f99f0827932b':
MediaDrm API Updates per api council review

commit | commitdiff | tree

Paul Lawrence [Fri, 15 May 2015 22:22:18 +0000 (22:22 +0000)]

Merge "DOn't save encryption settings when not encrypted" into mnc-dev

commit | commitdiff | tree

Paul McLean [Fri, 15 May 2015 22:22:22 +0000 (22:22 +0000)]

am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

* commit '8c501a3a56493257a59a0509697a6d04853df182':
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 22:18:58 +0000 (22:18 +0000)]

Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev

commit | commitdiff | tree

Adam Lesinski [Thu, 14 May 2015 20:57:08 +0000 (13:57 -0700)]

BatteryStatsHelper: Bluetooth wasn't being included in usage list

Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd

commit | commitdiff | tree

Jeff Tinker [Fri, 15 May 2015 22:13:32 +0000 (22:13 +0000)]

Merge "MediaDrm API Updates per api council review" into mnc-dev

commit | commitdiff | tree

Paul McLean [Fri, 15 May 2015 22:09:07 +0000 (22:09 +0000)]

Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:08:51 +0000 (22:08 +0000)]

am 2177ed40: Merge changes from topic \'bench\' into mnc-dev

* commit '2177ed407b8323e6f50d2aa64a62fbdc773e1859':
Command to change force adoptable state.
Initial pass at storage benchmarks.

commit | commitdiff | tree

Paul McLean [Fri, 15 May 2015 20:57:03 +0000 (13:57 -0700)]

Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java

Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:56:43 +0000 (21:56 +0000)]

am 93043930: am 10595666: am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev

* commit '9304393043f5716537595177770b8f3227937c99':
Remove UID from kernel cpu accounting when uninstalled

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:56:39 +0000 (21:56 +0000)]

am b5a29958: am 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev

* commit 'b5a29958e6caaf088f100cbd65654b5369a0d8b1':
Parse uid_cputime proc file

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]

Merge changes from topic 'bench' into mnc-dev

* changes:
Command to change force adoptable state.
Initial pass at storage benchmarks.

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 21:53:03 +0000 (14:53 -0700)]

Allow getChangingConfigurations() on DrawableWrapper with null drawable

Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:44:01 +0000 (21:44 +0000)]

am 10595666: am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev

* commit '10595666e441952c5ab7fa1d7f9b4e8f7d25d200':
Remove UID from kernel cpu accounting when uninstalled

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:43:55 +0000 (21:43 +0000)]

am 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev

* commit '1e9352aef5afbcc17cb87131b1fd23956846b816':
Parse uid_cputime proc file

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:32:22 +0000 (21:32 +0000)]

am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev

* commit '038959e851603500eb39b52fef33cbe75dbd73e3':
Remove UID from kernel cpu accounting when uninstalled

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:32:17 +0000 (21:32 +0000)]

am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev

* commit 'b99e6d69c30056520f7cb793e4be1851b3bd8426':
Parse uid_cputime proc file

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:24:59 +0000 (21:24 +0000)]

Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev

commit | commitdiff | tree

Adam Lesinski [Fri, 15 May 2015 21:23:07 +0000 (21:23 +0000)]

Merge "Parse uid_cputime proc file" into mnc-dev

commit | commitdiff | tree

Adam Powell [Fri, 15 May 2015 21:19:30 +0000 (21:19 +0000)]

am 1b9560e2: am ce3f7931: am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

* commit '1b9560e21f457ad3d3b66da0b6209f58414e894d':
Preserve ResolverDrawerLayout fully collapsed state across relayout

commit | commitdiff | tree

David Christie [Fri, 15 May 2015 21:19:25 +0000 (21:19 +0000)]

am 0ad7b9bc: am 12b49884: am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash. -It can\'t be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev

* commit '0ad7b9bc5d9561ea755e663fe8dab6f3a822bf0c':
Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 21:18:44 +0000 (14:18 -0700)]

Return correct year in DayPickerPagerAdapter.getYearForPosition()

Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.

Bug: 21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 20:45:00 +0000 (13:45 -0700)]

Command to change force adoptable state.

Since user builds can't setprop, add an explicit "sm" verb to change
the force adoptable state.

Bug: 21191915
Change-Id: I719d9b18c1a98c97442a5ddb1cc5512e8e4d3d3f

commit | commitdiff | tree

Adam Powell [Fri, 15 May 2015 21:15:24 +0000 (21:15 +0000)]

am ce3f7931: am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

* commit 'ce3f79312777e0b2f90a16062f50b11bdbdb6af1':
Preserve ResolverDrawerLayout fully collapsed state across relayout

commit | commitdiff | tree

David Christie [Fri, 15 May 2015 21:15:19 +0000 (21:15 +0000)]

am 12b49884: am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash. -It can\'t be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev

* commit '12b49884a033f8f6ca6fbd48a61a294fe95880bc':
Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178

commit | commitdiff | tree

Wale Ogunwale [Fri, 15 May 2015 21:08:23 +0000 (21:08 +0000)]

am 506c96a1: am b57da422: am 4f9fd626: Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev

* commit '506c96a1958444664a75915350d6baea0f6bb5fe':
Clean-up broadcast receivers when component is disabled.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 21:08:19 +0000 (21:08 +0000)]

am d500e512: am 4fa63b43: am 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

* commit 'd500e512708cb4d9e549c13511590cc6a03ff83a':
Fix lost singleton provider after force-stopping user or package.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 21:08:14 +0000 (21:08 +0000)]

am f2680c51: am bb1a0d83: am 27d86295: Merge "Also restart provider if there is external handle." into mnc-dev

* commit 'f2680c512bba151b8072a45dcc2cb3d016023722':
Also restart provider if there is external handle.

commit | commitdiff | tree

Adam Powell [Fri, 15 May 2015 21:07:05 +0000 (21:07 +0000)]

am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

* commit '6d54f81a9e5a96d84996418d547502b9ad8754ae':
Preserve ResolverDrawerLayout fully collapsed state across relayout

commit | commitdiff | tree

David Christie [Fri, 15 May 2015 21:02:37 +0000 (21:02 +0000)]

am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash. -It can\'t be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev

* commit 'f02c7d439169307eb6a49f9b02ece90f9f0d2dc0':
Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178

commit | commitdiff | tree

Adam Powell [Fri, 15 May 2015 21:00:59 +0000 (21:00 +0000)]

Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

commit | commitdiff | tree

Adam Powell [Fri, 15 May 2015 20:39:22 +0000 (13:39 -0700)]

Preserve ResolverDrawerLayout fully collapsed state across relayout

Fix a bug where a relayout that grows the size of ResolverDrawerLayout
content would cause it to get stuck in a half-collapsed state. This
could also lead to janky touch interaction behavior in
onStopNestedScroll as it animates to the fully open/closed state after
clicking in a descendant list.

Bug 21202727

Change-Id: I5f0a8b19fc079c57fcf2be7c6fa7627b1cb12a3c

commit | commitdiff | tree

Wale Ogunwale [Fri, 15 May 2015 20:57:40 +0000 (20:57 +0000)]

am b57da422: am 4f9fd626: Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev

* commit 'b57da4225d0b546a96eb493aeb2dda62e628f1d5':
Clean-up broadcast receivers when component is disabled.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:57:34 +0000 (20:57 +0000)]

am 4fa63b43: am 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

* commit '4fa63b43af0c2de757d6d9526ddc0514bdb57145':
Fix lost singleton provider after force-stopping user or package.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:57:28 +0000 (20:57 +0000)]

am bb1a0d83: am 27d86295: Merge "Also restart provider if there is external handle." into mnc-dev

* commit 'bb1a0d83fb760de2cf190acd0c481475180ee43c':
Also restart provider if there is external handle.

commit | commitdiff | tree

David Christie [Fri, 15 May 2015 20:50:54 +0000 (20:50 +0000)]

Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:50:53 +0000 (20:50 +0000)]

am 05e58407: am 72fd6186: am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

* commit '05e58407650c6a2d9dfc3130f15c38104baa823d':
Invalidate old accessibility bounds on CONTENT_CHANGE

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 04:07:42 +0000 (21:07 -0700)]

Initial pass at storage benchmarks.

Offer an interface for Settings to invoke benchmarks on various
attached volumes.

Bug: 21172095
Change-Id: I847ddc87c58285457d1324be87f70ce10507accb

commit | commitdiff | tree

Wale Ogunwale [Fri, 15 May 2015 20:43:44 +0000 (20:43 +0000)]

am 4f9fd626: Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev

* commit '4f9fd626d32989fe76c29e092d1fc591c6a8e1eb':
Clean-up broadcast receivers when component is disabled.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:43:39 +0000 (20:43 +0000)]

am 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

* commit '358d12a06c31c1471cffe2584715f2f8836e1abd':
Fix lost singleton provider after force-stopping user or package.

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:43:33 +0000 (20:43 +0000)]

am 27d86295: Merge "Also restart provider if there is external handle." into mnc-dev

* commit '27d86295347fbcdc7c2790c9b95e29b01f19d51b':
Also restart provider if there is external handle.

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:37:15 +0000 (20:37 +0000)]

am 72fd6186: am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

* commit '72fd61864a1766a741a619d958873d697415ecb4':
Invalidate old accessibility bounds on CONTENT_CHANGE

commit | commitdiff | tree

Wale Ogunwale [Fri, 15 May 2015 20:35:39 +0000 (20:35 +0000)]

Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:34:18 +0000 (20:34 +0000)]

Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

commit | commitdiff | tree

Olawale Ogunwale [Fri, 15 May 2015 20:33:47 +0000 (20:33 +0000)]

Merge "Also restart provider if there is external handle." into mnc-dev

commit | commitdiff | tree

Wale Ogunwale [Fri, 15 May 2015 19:49:13 +0000 (12:49 -0700)]

Clean-up broadcast receivers when component is disabled.

Bug: 15804187
Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317

commit | commitdiff | tree

Chad Brubaker [Fri, 15 May 2015 20:28:22 +0000 (20:28 +0000)]

am 95180396: am a194eb9b: Merge "Cleanup Keystore API"

* commit '9518039693f7492b980bcf4c1bd3e01ad75376e4':
Cleanup Keystore API

commit | commitdiff | tree

Chad Brubaker [Fri, 15 May 2015 20:28:18 +0000 (20:28 +0000)]

am 5c2573d5: am 8dae979a: am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev

* commit '5c2573d5c1dba8eaf8f3bc8e6c2cbfe096b95614':
Fix testAuthNeeded test

commit | commitdiff | tree

Selim Gurun [Fri, 15 May 2015 20:28:12 +0000 (20:28 +0000)]

am f8a45c55: am 62b845b7: am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev

* commit 'f8a45c55d42e1fc9f61d3bdbc369c34e65591c6a':
Rename PostMessageToMainFrame to PostWebMessage

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:28:07 +0000 (20:28 +0000)]

am fbd69c4e: am a4954e9b: am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev

* commit 'fbd69c4e60c4f3ac519a00453d13fdb73c5beb34':
Adjust light source for window position

commit | commitdiff | tree

Alex Klyubin [Fri, 15 May 2015 20:28:01 +0000 (20:28 +0000)]

am bef1706b: am 90c1c454: am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev

* commit 'bef1706b875ef63e867228ab88bbd5c4de9c8318':
Remove "encrypt at rest" flag from new AndroidKeyStore API.

commit | commitdiff | tree

Mady Mellor [Fri, 15 May 2015 20:27:55 +0000 (20:27 +0000)]

am 2016f97d: am e0b108cd: am 21417a0d: Merge "Text selection: Fix moving by character when should move by word" into mnc-dev

* commit '2016f97d481c7bdf85a7f4ecccb79dbafd0da325':
Text selection: Fix moving by character when should move by word

commit | commitdiff | tree

Mady Mellor [Fri, 15 May 2015 20:27:51 +0000 (20:27 +0000)]

am 5679d2c3: am 976c683b: am c25d6c22: Merge "Fix difficulty grabbing handles for small selections" into mnc-dev

* commit '5679d2c33431ad365db76fc2b380a5992213b7c9':
Fix difficulty grabbing handles for small selections

commit | commitdiff | tree

Yohei Yukawa [Fri, 15 May 2015 20:27:47 +0000 (20:27 +0000)]

am 8f169af3: am d34d5dba: am 79d0c080: Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev

* commit '8f169af3109751a620dc398d5deb0dda858b3fbe':
Revert "Fix IMMS#mInputShown state inconsistency."

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:23:55 +0000 (20:23 +0000)]

am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

* commit '2a576d9ec1ec353ee2278f2da01e685b6b7b24ee':
Invalidate old accessibility bounds on CONTENT_CHANGE

commit | commitdiff | tree

David Christie [Fri, 15 May 2015 20:23:08 +0000 (13:23 -0700)]

Fix issue where GeofenceHardwareImpl can crash.
-It can't be instantiated before looper thread
is ready.
Bug: 21185178

Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d

commit | commitdiff | tree

Chad Brubaker [Fri, 15 May 2015 20:17:51 +0000 (20:17 +0000)]

am a194eb9b: Merge "Cleanup Keystore API"

* commit 'a194eb9b5d36acc083aa55b9a152567d68e84f14':
Cleanup Keystore API

commit | commitdiff | tree

Chad Brubaker [Fri, 15 May 2015 20:11:44 +0000 (20:11 +0000)]

am 8dae979a: am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev

* commit '8dae979ae4ae0d4f1ed906d6e3754143689a9d3c':
Fix testAuthNeeded test

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:10:21 +0000 (20:10 +0000)]

Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

commit | commitdiff | tree

Selim Gurun [Fri, 15 May 2015 20:11:01 +0000 (20:11 +0000)]

am 62b845b7: am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev

* commit '62b845b73c79414fa142d40ec290d24813a33fc7':
Rename PostMessageToMainFrame to PostWebMessage

commit | commitdiff | tree

Alan Viverette [Fri, 15 May 2015 20:10:57 +0000 (20:10 +0000)]

am a4954e9b: am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev

* commit 'a4954e9bf3b76b4b94c45e446cd5f33b74979a0f':
Adjust light source for window position

commit | commitdiff | tree

Alex Klyubin [Fri, 15 May 2015 20:10:51 +0000 (20:10 +0000)]

am 90c1c454: am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev

* commit '90c1c454e4f313d152156a7c2b3e146bb56382f4':
Remove "encrypt at rest" flag from new AndroidKeyStore API.

commit | commitdiff | tree

Mady Mellor [Fri, 15 May 2015 20:10:47 +0000 (20:10 +0000)]

am e0b108cd: am 21417a0d: Merge "Text selection: Fix moving by character when should move by word" into mnc-dev

* commit 'e0b108cd951f3b6db13b562a5035f22fa1cbd961':
Text selection: Fix moving by character when should move by word

commit | commitdiff | tree

Mady Mellor [Fri, 15 May 2015 20:10:42 +0000 (20:10 +0000)]

am 976c683b: am c25d6c22: Merge "Fix difficulty grabbing handles for small selections" into mnc-dev

* commit '976c683bb725b79b8967dba5deaf4124747ba69b':
Fix difficulty grabbing handles for small selections

commit | commitdiff | tree

Yohei Yukawa [Fri, 15 May 2015 20:10:38 +0000 (20:10 +0000)]

am d34d5dba: am 79d0c080: Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev

* commit 'd34d5dba966bad63f6aa8a314d74850ce0062f31':
Revert "Fix IMMS#mInputShown state inconsistency."

commit | commitdiff | tree

Chad Brubaker [Fri, 15 May 2015 19:54:32 +0000 (19:54 +0000)]