OSDN Git Service
Robert Shih [Mon, 18 May 2015 16:19:34 +0000 (16:19 +0000)]
am
4ddd6a88: am
40bdcb7c: Merge "MediaPlayer: persistent track indices" into mnc-dev
* commit '
4ddd6a883caa112251f2bf8fdc0ecc233275d3de':
MediaPlayer: persistent track indices
Robert Shih [Mon, 18 May 2015 16:07:44 +0000 (16:07 +0000)]
am
40bdcb7c: Merge "MediaPlayer: persistent track indices" into mnc-dev
* commit '
40bdcb7c52b5bb47dce57bc97454edebc95e1885':
MediaPlayer: persistent track indices
Robert Shih [Mon, 18 May 2015 15:56:28 +0000 (15:56 +0000)]
Merge "MediaPlayer: persistent track indices" into mnc-dev
Jason Monk [Mon, 18 May 2015 15:55:52 +0000 (15:55 +0000)]
am
52d8b6fa: am
99f6977d: Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
* commit '
52d8b6fa306f6d681686dccaddbe8636cf60d800':
Move NetworkController broadcasts/listeners to BG
Jason Monk [Mon, 18 May 2015 15:43:26 +0000 (15:43 +0000)]
am
99f6977d: Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
* commit '
99f6977d3cbde054307cc1001cdc50f67399e4ca':
Move NetworkController broadcasts/listeners to BG
John Spurlock [Mon, 18 May 2015 15:37:59 +0000 (15:37 +0000)]
am
9a7b2c89: am
59c15e30: Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
* commit '
9a7b2c89888a490e007f7f037709d64b92c705fc':
DND: Fix locale and rtl issues in QS detail panel.
Jason Monk [Mon, 18 May 2015 15:35:22 +0000 (15:35 +0000)]
Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
Jason Monk [Thu, 14 May 2015 20:47:03 +0000 (16:47 -0400)]
Move NetworkController broadcasts/listeners to BG
Also do some refactoring to avoid having to sets of callback interfaces
with 75% of the same data.
Bug:
19520495
Change-Id: Ife1c71174c0d6a21f924f7de3cb2f97a04c3d5a1
John Spurlock [Mon, 18 May 2015 15:25:39 +0000 (15:25 +0000)]
am
59c15e30: Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
* commit '
59c15e30afbce7efbf410e5e57b1fe1be5770e3b':
DND: Fix locale and rtl issues in QS detail panel.
Simon Baldwin [Mon, 18 May 2015 15:19:33 +0000 (15:19 +0000)]
am
d7f3a3d2: am
128b3c86: Merge "Handle load from APK correctly for shared relro" into mnc-dev
* commit '
d7f3a3d2bd7f4d6ac2084b3799d0c7207cfcfcb3':
Handle load from APK correctly for shared relro
John Spurlock [Mon, 18 May 2015 15:19:19 +0000 (15:19 +0000)]
Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
John Spurlock [Mon, 18 May 2015 15:16:38 +0000 (11:16 -0400)]
DND: Fix locale and rtl issues in QS detail panel.
Bug:
21206470
Change-Id: Id84a36bf60b56ebacdf4098d0229e8fcd66aec56
Simon Baldwin [Mon, 18 May 2015 15:07:52 +0000 (15:07 +0000)]
am
128b3c86: Merge "Handle load from APK correctly for shared relro" into mnc-dev
* commit '
128b3c86c6f664b5a14c40d3d90c2f8172ea11b6':
Handle load from APK correctly for shared relro
John Spurlock [Mon, 18 May 2015 14:57:31 +0000 (14:57 +0000)]
am
4a44ad0a: am
cf053c13: SysUI Demo Mode: Ensure we have plenty of sims.
* commit '
4a44ad0a2edf1d46cf5cf66eadb97fc87692db6f':
SysUI Demo Mode: Ensure we have plenty of sims.
Simon Baldwin [Mon, 18 May 2015 14:57:21 +0000 (14:57 +0000)]
Merge "Handle load from APK correctly for shared relro" into mnc-dev
Simon Baldwin [Fri, 15 May 2015 11:56:50 +0000 (12:56 +0100)]
Handle load from APK correctly for shared relro
Update WebViewFactory's shared relro handling so that it operates
correctly where libraries are loaded directly from APK files.
Bug: http://b/
20810492
Bug: http://b/
8076853
Change-Id: I7887c7c0f235388d6a40c366693563b4876de992
John Spurlock [Mon, 18 May 2015 14:44:08 +0000 (14:44 +0000)]
am
cf053c13: SysUI Demo Mode: Ensure we have plenty of sims.
* commit '
cf053c13b832bcbadb337c19e18929d389875434':
SysUI Demo Mode: Ensure we have plenty of sims.
John Spurlock [Thu, 14 May 2015 20:33:59 +0000 (16:33 -0400)]
SysUI Demo Mode: Ensure we have plenty of sims.
And update some docs.
Bug:
21157785
Change-Id: I8e44e160377e66f15c6348a87326998c98cea787
Keisuke Kuroyanagi [Mon, 18 May 2015 05:20:07 +0000 (05:20 +0000)]
am
4fddad17: am
e20b22fe: Merge "Fix: Drag handle isn\'t updated after crossing bidi boundary." into mnc-dev
* commit '
4fddad171ed7b29254112909e59c4945dd3cbef8':
Fix: Drag handle isn't updated after crossing bidi boundary.
Keisuke Kuroyanagi [Mon, 18 May 2015 05:08:27 +0000 (05:08 +0000)]
am
e20b22fe: Merge "Fix: Drag handle isn\'t updated after crossing bidi boundary." into mnc-dev
* commit '
e20b22feb32d82a50a933141ecb8d03457a66f11':
Fix: Drag handle isn't updated after crossing bidi boundary.
Keisuke Kuroyanagi [Mon, 18 May 2015 04:57:07 +0000 (04:57 +0000)]
Merge "Fix: Drag handle isn't updated after crossing bidi boundary." into mnc-dev
Keisuke Kuroyanagi [Thu, 14 May 2015 11:10:57 +0000 (20:10 +0900)]
Fix: Drag handle isn't updated after crossing bidi boundary.
mDrawable is updated, but it was not re-drawn properly.
postInvalidate() should be called when the drawable is
updated.
Bug:
21141841
Change-Id: Icb3ddf18d05285ffa8758a9be256482d594ab8ed
Svet Ganov [Sun, 17 May 2015 11:40:26 +0000 (11:40 +0000)]
am
8cf86806: am
19877fa5: Revert a deleted file.
* commit '
8cf868064585739e2ef50da3e889e86b96fc9309':
Revert a deleted file.
Svet Ganov [Sun, 17 May 2015 11:40:21 +0000 (11:40 +0000)]
am
a4f7ea55: am
321f0157: Hide platform platform legacy permissions behind a menu option - framework.
* commit '
a4f7ea555df61b34a45c7bddff85972636e11692':
Hide platform platform legacy permissions behind a menu option - framework.
Svet Ganov [Sun, 17 May 2015 11:24:03 +0000 (11:24 +0000)]
am
19877fa5: Revert a deleted file.
* commit '
19877fa5f63de5d403e981c9d0025b237aea4306':
Revert a deleted file.
Svet Ganov [Sun, 17 May 2015 11:23:55 +0000 (11:23 +0000)]
am
321f0157: Hide platform platform legacy permissions behind a menu option - framework.
* commit '
321f01574e523dd680090694ea22e38b83a7c2b3':
Hide platform platform legacy permissions behind a menu option - framework.
Svet Ganov [Sun, 17 May 2015 07:48:57 +0000 (00:48 -0700)]
Revert a deleted file.
Change-Id: I48067da4316762e8a8a4562977c4b84655fdf0f4
Svet Ganov [Sun, 17 May 2015 05:51:50 +0000 (22:51 -0700)]
Hide platform platform legacy permissions behind a menu option - framework.
bug:
21195624
Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8
Roozbeh Pournader [Sat, 16 May 2015 19:11:48 +0000 (19:11 +0000)]
am
d3143a3f: am
e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
* commit '
d3143a3f85f34a1978fae7ef8e378d258fa29ce4':
Make unicodeWrap() return null if the input string is null.
Roozbeh Pournader [Sat, 16 May 2015 19:00:25 +0000 (19:00 +0000)]
am
e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
* commit '
e1fcced61ae81a07ca8c93d8a14dd4eb5b6e36ff':
Make unicodeWrap() return null if the input string is null.
Roozbeh Pournader [Sat, 16 May 2015 18:52:28 +0000 (18:52 +0000)]
Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
Roozbeh Pournader [Sat, 16 May 2015 00:34:59 +0000 (17:34 -0700)]
Make unicodeWrap() return null if the input string is null.
Previously, a NullPointerException was raised if the input was null.
Bug:
12894042
Change-Id: I5c5db484e5659659c1da91079adcba773ba7d83d
Andy Hung [Sat, 16 May 2015 04:34:36 +0000 (04:34 +0000)]
am
e07768b8: am
921ded79: Merge "Fix SoundPool.unload() return value" into mnc-dev
* commit '
e07768b8aa9b5c93c739892879c0dd3468accfa9':
Fix SoundPool.unload() return value
Andy Hung [Sat, 16 May 2015 04:22:32 +0000 (04:22 +0000)]
am
921ded79: Merge "Fix SoundPool.unload() return value" into mnc-dev
* commit '
921ded795f80e60fa5ba8430fc167e982f0725e2':
Fix SoundPool.unload() return value
Andy Hung [Sat, 16 May 2015 04:11:07 +0000 (04:11 +0000)]
Merge "Fix SoundPool.unload() return value" into mnc-dev
Dan Sandler [Sat, 16 May 2015 03:32:32 +0000 (03:32 +0000)]
am
a9dca98e: am
f6351ece: Merge "Mmm mmm mmm mmm." into mnc-dev
* commit '
a9dca98ec32ac0ad5e13c70d1954f3ea46230b7d':
Mmm mmm mmm mmm.
Dan Sandler [Sat, 16 May 2015 03:19:48 +0000 (03:19 +0000)]
am
f6351ece: Merge "Mmm mmm mmm mmm." into mnc-dev
* commit '
f6351ece2041a6b734f8eabebbd15ae452b33a12':
Mmm mmm mmm mmm.
Dan Sandler [Sat, 16 May 2015 03:11:52 +0000 (03:11 +0000)]
Merge "Mmm mmm mmm mmm." 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
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
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
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
Glenn Kasten [Sat, 16 May 2015 02:11:55 +0000 (02:11 +0000)]
Merge "Rename mChannels to mChannelMask" 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
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
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
Adam Lesinski [Sat, 16 May 2015 01:47:07 +0000 (01:47 +0000)]
Merge "AAPT2: Fix layout versioning" into mnc-dev
Andy Hung [Sat, 16 May 2015 01:39:09 +0000 (18:39 -0700)]
Fix SoundPool.unload() return value
Bug:
21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
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
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
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
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
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
Robert Shih [Sat, 16 May 2015 01:08:50 +0000 (01:08 +0000)]
Merge "MediaPlayer: clean up subtitle controller log spam" 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
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
Fyodor Kupolov [Sat, 16 May 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Hold wakelock while dexopting" into mnc-dev
Robert Shih [Thu, 29 Jan 2015 01:50:16 +0000 (17:50 -0800)]
MediaPlayer: persistent track indices
Maintain inband (from native extractor) and out-of-band tracks (added by
client) in a single append only vector. This ensures that the same track
corresponds to the same index through out playback.
Bug:
10373268
Change-Id: I87b3ca2d2c710ee9087f7686f82ab0e018f55fd0
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
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
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
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
Adam Lesinski [Fri, 15 May 2015 22:57:01 +0000 (22:57 +0000)]
Merge "BatteryStats: Enable bluetooth energy collection" 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
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
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"
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()
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
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
Zach Johnson [Fri, 15 May 2015 22:40:26 +0000 (22:40 +0000)]
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
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"
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()
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
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
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
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
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
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
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
Alan Viverette [Fri, 15 May 2015 22:25:39 +0000 (22:25 +0000)]
Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
Alan Viverette [Fri, 15 May 2015 22:25:25 +0000 (22:25 +0000)]
Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" 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.
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
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
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
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
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
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
Jeff Tinker [Fri, 15 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "MediaDrm API Updates per api council review" into mnc-dev
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
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.
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
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.
Alan Viverette [Fri, 15 May 2015 21:53:03 +0000 (14:53 -0700)]
Allow getChangingConfigurations() on DrawableWrapper with null drawable
Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
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
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
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
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
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
Adam Lesinski [Fri, 15 May 2015 21:23:07 +0000 (21:23 +0000)]
Merge "Parse uid_cputime proc file" into mnc-dev
OSDN Git Service
