OSDN Git Service

android-x86/frameworks-base.git
9 years agoam eb046057: am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev
Glenn Kasten [Sat, 16 May 2015 02:29:16 +0000 (02:29 +0000)]
am eb046057: am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev

* commit 'eb046057399e30d158ec62c6566d37a6d0f1a5b1':
  Rename mChannels to mChannelMask

9 years agoam 1f5a32ce: am 58cff53a: Merge "SkScalarDiv and its variants are deprecated" into...
Jérôme Poichet [Sat, 16 May 2015 02:29:11 +0000 (02:29 +0000)]
am 1f5a32ce: am 58cff53a: Merge "SkScalarDiv and its variants are deprecated" into mnc-dev

* commit '1f5a32cee3768236c3e969e19c2b55869f740a02':
  SkScalarDiv and its variants are deprecated

9 years agoam 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev
Glenn Kasten [Sat, 16 May 2015 02:18:02 +0000 (02:18 +0000)]
am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev

* commit '6e745aecf9d74e87a701fc57a948db75eefd86ca':
  Rename mChannels to mChannelMask

9 years agoam 58cff53a: Merge "SkScalarDiv and its variants are deprecated" into mnc-dev
Jérôme Poichet [Sat, 16 May 2015 02:17:56 +0000 (02:17 +0000)]
am 58cff53a: Merge "SkScalarDiv and its variants are deprecated" into mnc-dev

* commit '58cff53a5de6bce1fd70add90a3cd0bf14f779d6':
  SkScalarDiv and its variants are deprecated

9 years agoMerge "Rename mChannels to mChannelMask" into mnc-dev
Glenn Kasten [Sat, 16 May 2015 02:11:55 +0000 (02:11 +0000)]
Merge "Rename mChannels to mChannelMask" into mnc-dev

9 years agoam d3c7a61c: am 3dd41596: Merge "AAPT2: Fix layout versioning" into mnc-dev
Adam Lesinski [Sat, 16 May 2015 02:10:16 +0000 (02:10 +0000)]
am d3c7a61c: am 3dd41596: Merge "AAPT2: Fix layout versioning" into mnc-dev

* commit 'd3c7a61c32a596ba9218abf25e23fe92261dcb27':
  AAPT2: Fix layout versioning

9 years agoMerge "SkScalarDiv and its variants are deprecated" into mnc-dev
Jérôme Poichet [Sat, 16 May 2015 02:05:09 +0000 (02:05 +0000)]
Merge "SkScalarDiv and its variants are deprecated" into mnc-dev

9 years agoam 3dd41596: Merge "AAPT2: Fix layout versioning" into mnc-dev
Adam Lesinski [Sat, 16 May 2015 01:58:30 +0000 (01:58 +0000)]
am 3dd41596: Merge "AAPT2: Fix layout versioning" into mnc-dev

* commit '3dd41596b1226b3cd692610984086335e87fb45b':
  AAPT2: Fix layout versioning

9 years agoMerge "AAPT2: Fix layout versioning" into mnc-dev
Adam Lesinski [Sat, 16 May 2015 01:47:07 +0000 (01:47 +0000)]
Merge "AAPT2: Fix layout versioning" into mnc-dev

9 years agoam 8e185e48: am 50ba032f: OBEX: Handle GET operation properly
Hemant Gupta [Sat, 16 May 2015 01:41:56 +0000 (01:41 +0000)]
am 8e185e48: am 50ba032f: OBEX: Handle GET operation properly

* commit '8e185e48a0306d12b3d8ff79b5aa6b02b72d78cb':
  OBEX: Handle GET operation properly

9 years agoam 50ba032f: OBEX: Handle GET operation properly
Hemant Gupta [Sat, 16 May 2015 01:30:41 +0000 (01:30 +0000)]
am 50ba032f: OBEX: Handle GET operation properly

* commit '50ba032f4a81155c5f10561d39a4f258a0e4f244':
  OBEX: Handle GET operation properly

9 years agoam c8bb2211: am 89942588: Merge "MediaPlayer: clean up subtitle controller log spam...
Robert Shih [Sat, 16 May 2015 01:30:34 +0000 (01:30 +0000)]
am c8bb2211: am 89942588: Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev

* commit 'c8bb2211453b95b1a2173c87c186158fc3bdb33c':
  MediaPlayer: clean up subtitle controller log spam

9 years agoOBEX: Handle GET operation properly
Hemant Gupta [Fri, 30 May 2014 16:55:20 +0000 (22:25 +0530)]
OBEX: Handle GET operation properly

This change handles GET operation properly whenever the
Input stream is getting aborted in between. Without this
patch it was observed that GET request was being sent by
DUT even when abort has been sent/received resulting
in IOT issues with some remote devices including PTS.

Change-Id: Idcb4ea04abb57353af5ab1fef050b3a36579892e

9 years agoam 89942588: Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
Robert Shih [Sat, 16 May 2015 01:17:37 +0000 (01:17 +0000)]
am 89942588: Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev

* commit '89942588b7b89bd83c39e91236cafcc5f6775b5f':
  MediaPlayer: clean up subtitle controller log spam

9 years agoMerge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
Robert Shih [Sat, 16 May 2015 01:08:50 +0000 (01:08 +0000)]
Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev

9 years agoam e299f0ad: am a91a6f68: Merge "Hold wakelock while dexopting" into mnc-dev
Fyodor Kupolov [Sat, 16 May 2015 00:49:43 +0000 (00:49 +0000)]
am e299f0ad: am a91a6f68: Merge "Hold wakelock while dexopting" into mnc-dev

* commit 'e299f0ade486189f0db432dde097833eb241be1f':
  Hold wakelock while dexopting

9 years agoam a91a6f68: Merge "Hold wakelock while dexopting" into mnc-dev
Fyodor Kupolov [Sat, 16 May 2015 00:37:58 +0000 (00:37 +0000)]
am a91a6f68: Merge "Hold wakelock while dexopting" into mnc-dev

* commit 'a91a6f68f4c2564f763d28a3cfcd9d8b7a3f5db9':
  Hold wakelock while dexopting

9 years agoMerge "Hold wakelock while dexopting" into mnc-dev
Fyodor Kupolov [Sat, 16 May 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Hold wakelock while dexopting" into mnc-dev

9 years agoMediaPlayer: clean up subtitle controller log spam
Robert Shih [Fri, 15 May 2015 23:56:51 +0000 (16:56 -0700)]
MediaPlayer: clean up subtitle controller log spam

- create a default SubtitleController if not set explicitly
- log warning instead of error

Bug: 17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a

9 years agoam e171e34e: am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection...
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

9 years agoam 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
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

9 years agoam 4b197204: am a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission...
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

9 years agoMerge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 22:57:01 +0000 (22:57 +0000)]
Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev

9 years agoam a80282a7: Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
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

9 years agoBatteryStats: Enable bluetooth energy collection
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

9 years agoam bb2387bd: am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing...
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"

9 years agoam b50a8b97: am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYear...
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()

9 years agoam f0d40256: am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper...
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

9 years agoam edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted...
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

9 years agoMerge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
Zach Johnson [Fri, 15 May 2015 22:40:26 +0000 (22:40 +0000)]
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev

9 years agoam 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevice...
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"

9 years agoam 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition...
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()

9 years agoam 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with null...
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

9 years agoam 47247e72: am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included...
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

9 years agoam 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev
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

9 years agoam 922bdb1b: am 7020a137: Merge "MediaDrm API Updates per api council review" into...
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

9 years agoam 46f7c233: am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaD...
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

9 years agoMerge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java...
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

9 years agoRevert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
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

9 years agoMerge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
Alan Viverette [Fri, 15 May 2015 22:25:39 +0000 (22:25 +0000)]
Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

9 years agoMerge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into...
Alan Viverette [Fri, 15 May 2015 22:25:25 +0000 (22:25 +0000)]
Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

9 years agoam e12fe8cd: am 2177ed40: Merge changes from topic \'bench\' into mnc-dev
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.

9 years agoam ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage...
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

9 years agoam 7020a137: Merge "MediaDrm API Updates per api council review" into mnc-dev
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

9 years agoMerge "DOn't save encryption settings when not encrypted" into mnc-dev
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

9 years agoam 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser...
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

9 years agoMerge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev
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

9 years agoBatteryStatsHelper: Bluetooth wasn't being included in usage list
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

9 years agoMerge "MediaDrm API Updates per api council review" into mnc-dev
Jeff Tinker [Fri, 15 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "MediaDrm API Updates per api council review" into mnc-dev

9 years agoMerge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into...
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

9 years agoam 2177ed40: Merge changes from topic \'bench\' into mnc-dev
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.

9 years agoAddeding try/catch to card#/device# parsing in AlsaDevicesParser.java
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

9 years agoMerge changes from topic 'bench' into mnc-dev
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.

9 years agoAllow getChangingConfigurations() on DrawableWrapper with null drawable
Alan Viverette [Fri, 15 May 2015 21:53:03 +0000 (14:53 -0700)]
Allow getChangingConfigurations() on DrawableWrapper with null drawable

Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a

9 years agoam 10595666: am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstall...
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

9 years agoam 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
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

9 years agoam 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into...
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

9 years agoam b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
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

9 years agoMerge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev
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

9 years agoMerge "Parse uid_cputime proc file" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 21:23:07 +0000 (21:23 +0000)]
Merge "Parse uid_cputime proc file" into mnc-dev

9 years agoReturn correct year in DayPickerPagerAdapter.getYearForPosition()
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

9 years agoCommand to change force adoptable state.
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

9 years agoam ce3f7931: am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state...
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

9 years agoam 12b49884: am f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash....
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

9 years agoam 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayo...
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

9 years agoam f02c7d43: Merge "Fix issue where GeofenceHardwareImpl can crash. -It can\'t be...
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

9 years agoMerge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into...
Adam Powell [Fri, 15 May 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

9 years agoPreserve ResolverDrawerLayout fully collapsed state across relayout
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

9 years agoam b57da422: am 4f9fd626: Merge "Clean-up broadcast receivers when component is disab...
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.

9 years agoam 4fa63b43: am 358d12a0: Merge "Fix lost singleton provider after force-stopping...
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.

9 years agoam bb1a0d83: am 27d86295: Merge "Also restart provider if there is external handle...
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.

9 years agoMerge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated...
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

9 years agoInitial pass at storage benchmarks.
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

9 years agoam 4f9fd626: Merge "Clean-up broadcast receivers when component is disabled." into...
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.

9 years agoam 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package...
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.

9 years agoam 27d86295: Merge "Also restart provider if there is external handle." into mnc-dev
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.

9 years agoam 72fd6186: am 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANG...
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

9 years agoMerge "Clean-up broadcast receivers when component is disabled." into mnc-dev
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

9 years agoMerge "Fix lost singleton provider after force-stopping user or package." into mnc-dev
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

9 years agoMerge "Also restart provider if there is external handle." into mnc-dev
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

9 years agoClean-up broadcast receivers when component is disabled.
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

9 years agoam 2a576d9e: Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
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

9 years agoFix issue where GeofenceHardwareImpl can crash.
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

9 years agoam a194eb9b: Merge "Cleanup Keystore API"
Chad Brubaker [Fri, 15 May 2015 20:17:51 +0000 (20:17 +0000)]
am a194eb9b: Merge "Cleanup Keystore API"

* commit 'a194eb9b5d36acc083aa55b9a152567d68e84f14':
  Cleanup Keystore API

9 years agoam 8dae979a: am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev
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

9 years agoMerge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
Alan Viverette [Fri, 15 May 2015 20:10:21 +0000 (20:10 +0000)]
Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev

9 years agoam 62b845b7: am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage...
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

9 years agoam a4954e9b: am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev
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

9 years agoam 90c1c454: am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeySto...
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.

9 years agoam e0b108cd: am 21417a0d: Merge "Text selection: Fix moving by character when should...
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

9 years agoam 976c683b: am c25d6c22: Merge "Fix difficulty grabbing handles for small selections...
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

9 years agoam d34d5dba: am 79d0c080: Merge "Revert "Fix IMMS#mInputShown state inconsistency...
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."

9 years agoMerge "Cleanup Keystore API"
Chad Brubaker [Fri, 15 May 2015 19:54:32 +0000 (19:54 +0000)]
Merge "Cleanup Keystore API"

9 years agoam 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev
Chad Brubaker [Fri, 15 May 2015 19:45:06 +0000 (19:45 +0000)]
am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev

* commit '206df8c5e5cbebe4dc126ab325bb6ff746ccca85':
  Fix testAuthNeeded test

9 years agoMerge "Fix testAuthNeeded test" into mnc-dev
Chad Brubaker [Fri, 15 May 2015 19:37:25 +0000 (19:37 +0000)]
Merge "Fix testAuthNeeded test" into mnc-dev

9 years agoam afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev
Selim Gurun [Fri, 15 May 2015 18:58:21 +0000 (18:58 +0000)]
am afabc217: Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev

* commit 'afabc217226c11bad46de4eac557f8fe2e15f708':
  Rename PostMessageToMainFrame to PostWebMessage

9 years agoam 2cc4a475: Merge "Adjust light source for window position" into mnc-dev
Alan Viverette [Fri, 15 May 2015 18:51:54 +0000 (18:51 +0000)]
am 2cc4a475: Merge "Adjust light source for window position" into mnc-dev

* commit '2cc4a4755fcd41900e042c75cc47879d46acecda':
  Adjust light source for window position

9 years agoam 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API."...
Alex Klyubin [Fri, 15 May 2015 18:51:48 +0000 (18:51 +0000)]
am 6a5f8508: Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-dev

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

9 years agoam 21417a0d: Merge "Text selection: Fix moving by character when should move by word...
Mady Mellor [Fri, 15 May 2015 18:51:37 +0000 (18:51 +0000)]
am 21417a0d: Merge "Text selection: Fix moving by character when should move by word" into mnc-dev

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

9 years agoam c25d6c22: Merge "Fix difficulty grabbing handles for small selections" into mnc-dev
Mady Mellor [Fri, 15 May 2015 18:51:32 +0000 (18:51 +0000)]
am c25d6c22: Merge "Fix difficulty grabbing handles for small selections" into mnc-dev

* commit 'c25d6c22bbb2b8d6efbe4b4ab5252ca8f266889f':
  Fix difficulty grabbing handles for small selections