Simon Baldwin
128b3c86c6
Merge "Handle load from APK correctly for shared relro" into mnc-dev
2015-05-18 14:57:22 +00:00
Simon Baldwin
b98082dcfb
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
2015-05-18 15:56:27 +01:00
John Spurlock
cf053c13b8
SysUI Demo Mode: Ensure we have plenty of sims.
...
And update some docs.
Bug: 21157785
Change-Id: I8e44e160377e66f15c6348a87326998c98cea787
2015-05-18 09:38:07 -04:00
Keisuke Kuroyanagi
e20b22feb3
Merge "Fix: Drag handle isn't updated after crossing bidi boundary." into mnc-dev
2015-05-18 04:57:09 +00:00
Keisuke Kuroyanagi
33f81ac108
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
2015-05-18 13:56:06 +09:00
Svet Ganov
19877fa5f6
Revert a deleted file.
...
Change-Id: I48067da4316762e8a8a4562977c4b84655fdf0f4
2015-05-17 00:48:57 -07:00
Svet Ganov
321f01574e
Hide platform platform legacy permissions behind a menu option - framework.
...
bug:21195624
Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8
2015-05-16 22:52:33 -07:00
Roozbeh Pournader
e1fcced61a
Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
2015-05-16 18:52:30 +00:00
Roozbeh Pournader
f156cb31c0
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
2015-05-16 18:50:18 +00:00
Andy Hung
921ded795f
Merge "Fix SoundPool.unload() return value" into mnc-dev
2015-05-16 04:11:09 +00:00
Dan Sandler
f6351ece20
Merge "Mmm mmm mmm mmm." into mnc-dev
2015-05-16 03:11:53 +00:00
Glenn Kasten
6e745aecf9
Merge "Rename mChannels to mChannelMask" into mnc-dev
2015-05-16 02:11:56 +00:00
Jérôme Poichet
58cff53a5d
Merge "SkScalarDiv and its variants are deprecated" into mnc-dev
2015-05-16 02:05:12 +00:00
Adam Lesinski
3dd41596b1
Merge "AAPT2: Fix layout versioning" into mnc-dev
2015-05-16 01:47:08 +00:00
Andy Hung
a6238ef389
Fix SoundPool.unload() return value
...
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
2015-05-15 18:43:03 -07:00
Hemant Gupta
50ba032f4a
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
2015-05-16 01:19:19 +00:00
Robert Shih
89942588b7
Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
2015-05-16 01:08:53 +00:00
Fyodor Kupolov
a91a6f68f4
Merge "Hold wakelock while dexopting" into mnc-dev
2015-05-16 00:26:09 +00:00
Robert Shih
1973189fe0
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
2015-05-15 17:03:46 -07:00
Adam Lesinski
18f84162fe
Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
2015-05-15 22:57:02 +00:00
Adam Lesinski
719e61fa5f
BatteryStats: Enable bluetooth energy collection
...
Device firmware has been fixed and bluetooth energy values
should be correct now.
Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
2015-05-15 15:49:24 -07:00
Zach Johnson
a80282a733
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
2015-05-15 22:40:35 +00:00
Paul Mclean
0844dcd070
Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev
2015-05-15 22:28:31 +00:00
Paul Mclean
788854b8c0
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
...
This reverts commit 34f5e042904c22643f96d4466caa003073708b62.
Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
2015-05-15 22:28:07 +00:00
Alan Viverette
1ac88088ad
Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
2015-05-15 22:25:41 +00:00
Alan Viverette
6044798ef7
Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev
2015-05-15 22:25:26 +00:00
Paul Lawrence
21c8a49306
Merge "DOn't save encryption settings when not encrypted" into mnc-dev
2015-05-15 22:22:25 +00:00
Adam Lesinski
ce27996c4f
Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev
2015-05-15 22:18:59 +00:00
Adam Lesinski
ee36c2861a
BatteryStatsHelper: Bluetooth wasn't being included in usage list
...
Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
2015-05-15 15:18:06 -07:00
Jeff Tinker
7020a1377a
Merge "MediaDrm API Updates per api council review" into mnc-dev
2015-05-15 22:13:33 +00:00
Paul McLean
8c501a3a56
Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev
2015-05-15 22:09:15 +00:00
Paul McLean
34f5e04290
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
...
Not the cause of, but related to...
Bug: 19082426
Change-Id: I296c67989debc932838b39d63fdb57396448c50c
2015-05-15 14:58:30 -07: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
Alan Viverette
e922f49b62
Allow getChangingConfigurations() on DrawableWrapper with null drawable
...
Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
2015-05-15 14:53:03 -07: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
Alan Viverette
bd51b4d0b9
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
2015-05-15 14:18:44 -07: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
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
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
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
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
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
Alan Viverette
2a576d9ec1
Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-dev
2015-05-15 20:11:20 +00:00
Dan Sandler
696f6a3c48
Mmm mmm mmm mmm.
...
Change-Id: I23b560694b9cc0eb2103ec16769b0446099d1e83
2015-05-15 16:10:22 -04:00
Chad Brubaker
206df8c5e5
Merge "Fix testAuthNeeded test" into mnc-dev
2015-05-15 19:37:26 +00:00