Commit Graph

194321 Commits

Author SHA1 Message Date
Jeff Sharkey
c3974f28cb 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.
2015-05-15 22:37:37 +00:00
Jeff Sharkey
28d7cfcb0a 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.
2015-05-15 22:22:32 +00:00
Jeff Sharkey
e12fe8cd98 am 2177ed40: Merge changes from topic \'bench\' into mnc-dev
* commit '2177ed407b8323e6f50d2aa64a62fbdc773e1859':
  Command to change force adoptable state.
  Initial pass at storage benchmarks.
2015-05-15 22:08:51 +00:00
Adam Lesinski
d59a90575a 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
2015-05-15 21:56:43 +00:00
Adam Lesinski
dce04d8b9a am b5a29958: am 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
* commit 'b5a29958e6caaf088f100cbd65654b5369a0d8b1':
  Parse uid_cputime proc file
2015-05-15 21:56:39 +00:00
Jeff Sharkey
2177ed407b Merge changes from topic 'bench' into mnc-dev
* changes:
  Command to change force adoptable state.
  Initial pass at storage benchmarks.
2015-05-15 21:55:57 +00:00
Adam Lesinski
9304393043 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
2015-05-15 21:44:01 +00:00
Adam Lesinski
b5a29958e6 am 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
* commit '1e9352aef5afbcc17cb87131b1fd23956846b816':
  Parse uid_cputime proc file
2015-05-15 21:43:55 +00:00
Adam Lesinski
10595666e4 am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev
* commit '038959e851603500eb39b52fef33cbe75dbd73e3':
  Remove UID from kernel cpu accounting when uninstalled
2015-05-15 21:32:22 +00:00
Adam Lesinski
1e9352aef5 am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
* commit 'b99e6d69c30056520f7cb793e4be1851b3bd8426':
  Parse uid_cputime proc file
2015-05-15 21:32:17 +00:00
Adam Lesinski
038959e851 Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 2015-05-15 21:25:00 +00:00
Adam Lesinski
b99e6d69c3 Merge "Parse uid_cputime proc file" into mnc-dev 2015-05-15 21:23:09 +00:00
Adam Powell
94f1bf7a9a 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
2015-05-15 21:19:30 +00:00
David Christie
6a131feeec 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
2015-05-15 21:19:25 +00:00
Jeff Sharkey
4c099d0c49 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
2015-05-15 14:15:35 -07:00
Adam Powell
1b9560e21f am ce3f7931: am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev
* commit 'ce3f79312777e0b2f90a16062f50b11bdbdb6af1':
  Preserve ResolverDrawerLayout fully collapsed state across relayout
2015-05-15 21:15:24 +00:00
David Christie
0ad7b9bc5d 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
2015-05-15 21:15:19 +00:00
Wale Ogunwale
b475ee34c8 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.
2015-05-15 21:08:23 +00:00
Olawale Ogunwale
3afb787850 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.
2015-05-15 21:08:19 +00:00
Olawale Ogunwale
9ff1416545 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.
2015-05-15 21:08:14 +00:00
Adam Powell
ce3f793127 am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev
* commit '6d54f81a9e5a96d84996418d547502b9ad8754ae':
  Preserve ResolverDrawerLayout fully collapsed state across relayout
2015-05-15 21:07:05 +00:00
David Christie
12b49884a0 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
2015-05-15 21:02:37 +00:00
Adam Powell
6d54f81a9e Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev 2015-05-15 21:01:17 +00:00
Adam Powell
c9f2293471 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
2015-05-15 13:59:40 -07:00
Wale Ogunwale
506c96a195 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.
2015-05-15 20:57:40 +00:00
Olawale Ogunwale
d500e51270 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.
2015-05-15 20:57:34 +00:00
Olawale Ogunwale
f2680c512b 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.
2015-05-15 20:57:28 +00:00
David Christie
f02c7d4391 Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev 2015-05-15 20:50:55 +00:00
Alan Viverette
eaf87a3f68 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
2015-05-15 20:50:53 +00:00
Jeff Sharkey
9756d75ec2 Initial pass at storage benchmarks.
Offer an interface for Settings to invoke benchmarks on various
attached volumes.

Bug: 21172095
Change-Id: I847ddc87c58285457d1324be87f70ce10507accb
2015-05-15 13:47:12 -07:00
Wale Ogunwale
b57da4225d am 4f9fd626: Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev
* commit '4f9fd626d32989fe76c29e092d1fc591c6a8e1eb':
  Clean-up broadcast receivers when component is disabled.
2015-05-15 20:43:44 +00:00
Olawale Ogunwale
4fa63b43af 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.
2015-05-15 20:43:39 +00:00
Olawale Ogunwale
bb1a0d83fb am 27d86295: Merge "Also restart provider if there is external handle." into mnc-dev
* commit '27d86295347fbcdc7c2790c9b95e29b01f19d51b':
  Also restart provider if there is external handle.
2015-05-15 20:43:33 +00:00
Alan Viverette
05e5840765 am 72fd6186: am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
* commit '72fd61864a1766a741a619d958873d697415ecb4':
  Invalidate old accessibility bounds on CONTENT_CHANGE
2015-05-15 20:37:15 +00:00
Wale Ogunwale
4f9fd626d3 Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev 2015-05-15 20:35:40 +00:00
Olawale Ogunwale
358d12a06c Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev 2015-05-15 20:34:19 +00:00
Olawale Ogunwale
27d8629534 Merge "Also restart provider if there is external handle." into mnc-dev 2015-05-15 20:33:48 +00:00
Wale Ogunwale
ca1c12581a Clean-up broadcast receivers when component is disabled.
Bug: 15804187
Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317
2015-05-15 13:33:16 -07:00
Chad Brubaker
2d413abe68 am 95180396: am a194eb9b: Merge "Cleanup Keystore API"
* commit '9518039693f7492b980bcf4c1bd3e01ad75376e4':
  Cleanup Keystore API
2015-05-15 20:28:22 +00:00
Chad Brubaker
f98052ae3a am 5c2573d5: am 8dae979a: am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev
* commit '5c2573d5c1dba8eaf8f3bc8e6c2cbfe096b95614':
  Fix testAuthNeeded test
2015-05-15 20:28:18 +00:00
Selim Gurun
dbd61b4156 am f8a45c55: am 62b845b7: am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev
* commit 'f8a45c55d42e1fc9f61d3bdbc369c34e65591c6a':
  Rename PostMessageToMainFrame to PostWebMessage
2015-05-15 20:28:12 +00:00
Alan Viverette
6e1e7e4edd am fbd69c4e: am a4954e9b: am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev
* commit 'fbd69c4e60c4f3ac519a00453d13fdb73c5beb34':
  Adjust light source for window position
2015-05-15 20:28:07 +00:00
Alex Klyubin
9d6c0b68e0 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.
2015-05-15 20:28:01 +00:00
Mady Mellor
25a339103c 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
2015-05-15 20:27:55 +00:00
Mady Mellor
de6b408b87 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
2015-05-15 20:27:51 +00:00
Yohei Yukawa
60c0fe06f2 am 8f169af3: am d34d5dba: am 79d0c080: Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev
* commit '8f169af3109751a620dc398d5deb0dda858b3fbe':
  Revert "Fix IMMS#mInputShown state inconsistency."
2015-05-15 20:27:47 +00:00
Alan Viverette
72fd61864a am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
* commit '2a576d9ec1ec353ee2278f2da01e685b6b7b24ee':
  Invalidate old accessibility bounds on CONTENT_CHANGE
2015-05-15 20:23:55 +00:00
David Christie
38feb6f1ec Fix issue where GeofenceHardwareImpl can crash.
-It can't be instantiated before looper thread
 is ready.
Bug: 21185178

Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d
2015-05-15 13:23:08 -07:00
Chad Brubaker
9518039693 am a194eb9b: Merge "Cleanup Keystore API"
* commit 'a194eb9b5d36acc083aa55b9a152567d68e84f14':
  Cleanup Keystore API
2015-05-15 20:17:51 +00:00
Chad Brubaker
5c2573d5c1 am 8dae979a: am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev
* commit '8dae979ae4ae0d4f1ed906d6e3754143689a9d3c':
  Fix testAuthNeeded test
2015-05-15 20:11:44 +00:00