OSDN Git Service
Makoto Onuki [Thu, 25 Jun 2015 22:15:00 +0000 (22:15 +0000)]
am
f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev
* commit '
f97497db5a7cfb8514836af39efef56488edf3ac':
Fix Formatter.formatBytes() crash on non-EN locales
Makoto Onuki [Thu, 25 Jun 2015 22:02:55 +0000 (22:02 +0000)]
Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev
Jorim Jaggi [Thu, 25 Jun 2015 21:55:34 +0000 (21:55 +0000)]
am
94f6f061: Speedup PIN/Pattern dismissal
* commit '
94f6f0610147de16aae7c39f97f21ee31591dd6f':
Speedup PIN/Pattern dismissal
Tenghui Zhu [Thu, 25 Jun 2015 21:55:30 +0000 (21:55 +0000)]
am
5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev
* commit '
5daee1dc27d7b0eadfddefcaf73da229579fd436':
Limit dotProduct value to 1.0f, so acosf would not return NaN.
Jorim Jaggi [Thu, 25 Jun 2015 21:47:24 +0000 (14:47 -0700)]
Speedup PIN/Pattern dismissal
Bug:
22096344
Change-Id: I50d5ecaa03aae94cecf9da173f0d6318faaf6a1a
Makoto Onuki [Thu, 25 Jun 2015 18:56:44 +0000 (11:56 -0700)]
Fix Formatter.formatBytes() crash on non-EN locales
Bug
22012651
Change-Id: I21b1834a35647527002e01d76a7eb3a6a0354512
Tenghui Zhu [Thu, 25 Jun 2015 21:45:31 +0000 (21:45 +0000)]
Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev
Jerome Poichet [Thu, 25 Jun 2015 21:35:44 +0000 (21:35 +0000)]
am
fd709421: Merge "Preventing leak" into mnc-dev
* commit '
fd70942147edec7eb512c72c3fd0f89a3d7fa646':
Preventing leak
Lazar Trsic [Tue, 23 Jun 2015 09:46:49 +0000 (11:46 +0200)]
Limit dotProduct value to 1.0f, so acosf would not return NaN.
Cherry pick of
b561f39d01c211425bfefaaa7b31ebe097e7ba79 from AOSP master.
Due to precision loss of float math, we sometimes get 1.
000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.
At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.
Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8
Jerome Poichet [Thu, 25 Jun 2015 21:21:00 +0000 (21:21 +0000)]
Merge "Preventing leak" into mnc-dev
George Mount [Thu, 25 Jun 2015 21:06:38 +0000 (21:06 +0000)]
am
d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev
* commit '
d9f3aa58d7e651dfbe9b395086040887d32d5a98':
Fix removeTarget to remove by ID instead of index.
George Mount [Thu, 25 Jun 2015 20:55:33 +0000 (20:55 +0000)]
Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:07:47 +0000 (20:07 +0000)]
am
e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev
* commit '
e71c6e3832a963ed3cfa8c124374799f774eccb3':
Constrain ListPopupWindow hint width spec to >= 0
Alan Viverette [Thu, 25 Jun 2015 20:07:43 +0000 (20:07 +0000)]
am
fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev
* commit '
fdf102e62ddf04ed1a3157b00d4da5b56d298df3':
Constrain child width and height to >= 0 in FrameLayout.onMeasure()
Alan Viverette [Thu, 25 Jun 2015 20:00:54 +0000 (20:00 +0000)]
Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:00:03 +0000 (13:00 -0700)]
Constrain ListPopupWindow hint width spec to >= 0
Bug:
22092169
Change-Id: Ia05302cf8d167aae26eccbf53dd3fd21d09b326d
Alan Viverette [Thu, 25 Jun 2015 19:57:01 +0000 (19:57 +0000)]
Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev
Yohei Yukawa [Thu, 25 Jun 2015 19:48:16 +0000 (19:48 +0000)]
am
ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev
* commit '
ab142f7f57c8fd805e6cf65fccf2c8d3eba285b5':
Handle back key to cancel text action mode in full-screen IME.
Yohei Yukawa [Thu, 25 Jun 2015 19:39:31 +0000 (19:39 +0000)]
Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 19:24:27 +0000 (12:24 -0700)]
Constrain child width and height to >= 0 in FrameLayout.onMeasure()
Bug:
22093669
Change-Id: I55e8a0289f871b73ed07f3d73e8297786f9acac1
Jerome Poichet [Thu, 25 Jun 2015 19:03:02 +0000 (12:03 -0700)]
Preventing leak
When transitioning from ON to OFF with LE Advertisers, advertiser do not
get a chance to unregister themselves as the stopAdvertising checks the
state of the stack and throws before unregistering the object.
It will then never remove the callback objects causing a leak.
b/
22092678 | Remote service crash after switching to restricted profile
Change-Id: I04817026a524d10d60abdd8b533554a71a0112e2
Svetoslav [Thu, 25 Jun 2015 19:03:42 +0000 (19:03 +0000)]
am
f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev
* commit '
f9c6dbb6d1c2001c0ccd7479668eb59b1d4b7c5c':
Add missing conditional in settings provider
Selim Cinek [Thu, 25 Jun 2015 19:03:37 +0000 (19:03 +0000)]
am
0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev
* commit '
0ebd001f3068116b93e8a447f35f01a5b96ec161':
Fixed a HUN crash with notification children
Svetoslav [Thu, 25 Jun 2015 18:53:57 +0000 (18:53 +0000)]
Merge "Add missing conditional in settings provider" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:53:02 +0000 (11:53 -0700)]
Add missing conditional in settings provider
Change-Id: I717e8b87eccbedf1a1abead77e7856a2aa2405fa
Selim Cinek [Thu, 25 Jun 2015 18:37:54 +0000 (18:37 +0000)]
Merge "Fixed a HUN crash with notification children" into mnc-dev
Chris Wren [Thu, 25 Jun 2015 18:27:16 +0000 (18:27 +0000)]
am
c26939b4: Merge "add banned packages to notification dumpsys" into mnc-dev
* commit '
c26939b4781bd70ab0fb8fff4151bfe616ad15d1':
add banned packages to notification dumpsys
Svetoslav [Thu, 25 Jun 2015 18:27:12 +0000 (18:27 +0000)]
am
263b6e69: Merge "Prevent certain actions of app has revoked permissions" into mnc-dev
* commit '
263b6e6983f50910f7e59d688ceb7ebd031ea2b3':
Prevent certain actions of app has revoked permissions
Jun Mukai [Thu, 25 Jun 2015 18:27:07 +0000 (18:27 +0000)]
am
46f087c4: Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev
* commit '
46f087c43b0fd3e4740bbb7183601e645a493716':
Apply thumbTint and trackTint styles to Switch from xml.
Chris Wren [Thu, 25 Jun 2015 18:21:01 +0000 (18:21 +0000)]
Merge "add banned packages to notification dumpsys" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:20:14 +0000 (18:20 +0000)]
Merge "Prevent certain actions of app has revoked permissions" into mnc-dev
Jun Mukai [Thu, 25 Jun 2015 18:16:55 +0000 (18:16 +0000)]
Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev
Chris Wren [Thu, 25 Jun 2015 18:04:33 +0000 (14:04 -0400)]
add banned packages to notification dumpsys
Bug:
20451514
Change-Id: I4ae3adfc8dcd7e7625ca41950e5642c30b8cb25e
Selim Gurun [Thu, 25 Jun 2015 18:07:06 +0000 (18:07 +0000)]
am
cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev
* commit '
cb247780d3a5ecaa66587443eaa090dcd04996c6':
Remove Webviewtests in frameworks
Chris Manton [Thu, 25 Jun 2015 18:01:23 +0000 (18:01 +0000)]
am
60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
* commit '
60061c26a24f654f5a6ac599d85c3bea14ee9aff':
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
Svetoslav [Thu, 25 Jun 2015 01:47:07 +0000 (18:47 -0700)]
Prevent certain actions of app has revoked permissions
bug:
21808294
Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
Selim Gurun [Thu, 25 Jun 2015 17:53:49 +0000 (17:53 +0000)]
Merge "Remove Webviewtests in frameworks" into mnc-dev
Selim Gurun [Thu, 25 Jun 2015 17:35:51 +0000 (10:35 -0700)]
Remove Webviewtests in frameworks
Bug:
22090564
These tests were not touched for at least 3 years, and with webview
moving to chromium, they are tested at the chromium side.
Change-Id: I4424871dd97c5dc23bb3dbdcee0915d5ab893c7e
Yusuke Sato [Thu, 25 Jun 2015 17:46:35 +0000 (17:46 +0000)]
am
0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev
* commit '
0f61c7dcc40276788f58300d5d8ca85be2ce0e59':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Chris Manton [Thu, 25 Jun 2015 17:42:16 +0000 (17:42 +0000)]
Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
Nancy Chen [Thu, 25 Jun 2015 17:35:34 +0000 (17:35 +0000)]
am
1979dd63: Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev
* commit '
1979dd631d2da88c5d920013b5162700622bd0d3':
Add comments for visual voicemail short codes in whitelist.
Winson Chung [Thu, 25 Jun 2015 17:35:06 +0000 (17:35 +0000)]
am
b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev
* commit '
b49dbeef5253c346a172b7516c4526fa79dadd77':
Refactoring recents search bar widget logic.
Yusuke Sato [Thu, 25 Jun 2015 17:33:59 +0000 (17:33 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev
Nancy Chen [Thu, 25 Jun 2015 17:32:22 +0000 (17:32 +0000)]
Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev
Winson Chung [Thu, 25 Jun 2015 17:24:53 +0000 (17:24 +0000)]
Merge "Refactoring recents search bar widget logic." into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 17:16:10 +0000 (17:16 +0000)]
am
efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev
* commit '
efb49bd81101046ced1f75aeef81dcda27580514':
Constrain width and height to >= 0 in FastScroller layout
Chris Manton [Wed, 24 Jun 2015 23:47:49 +0000 (16:47 -0700)]
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
Bug:
20828356
Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
Alan Viverette [Thu, 25 Jun 2015 17:08:41 +0000 (17:08 +0000)]
Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev
Alex Klyubin [Thu, 25 Jun 2015 17:00:08 +0000 (17:00 +0000)]
am
9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev
* commit '
9440a6e6bed93e2816647b6834d543fd57181a86':
Support RSA encrypt using private key and PKCS#1 paddding.
Alan Viverette [Thu, 25 Jun 2015 16:57:30 +0000 (09:57 -0700)]
Constrain width and height to >= 0 in FastScroller layout
Bug:
22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
Alex Klyubin [Thu, 25 Jun 2015 16:46:15 +0000 (16:46 +0000)]
Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev
Alex Klyubin [Thu, 25 Jun 2015 16:04:37 +0000 (09:04 -0700)]
Support RSA encrypt using private key and PKCS#1 paddding.
Some apps such as OpenVPN Connect for some reason generate
PKCS#1-padded RSA signatures using Cipher (initialized in
Cipher.ENCRYPT_MODE with private key!) instead of using Signature.
Unfortunately, RI supports this strange behavior and previous releases
of Android Keystore did the same. So, we have to continue supporting
this craziness.
Bug:
22083023
Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
Mady Mellor [Thu, 25 Jun 2015 16:03:22 +0000 (16:03 +0000)]
am
d4d802be: Merge "Fix: Don\'t display the drag handles when focus is lost" into mnc-dev
* commit '
d4d802be39c67bf207bbb693d32c6a59c78ed3bb':
Fix: Don't display the drag handles when focus is lost
Andrei Stingaceanu [Thu, 25 Jun 2015 16:03:18 +0000 (16:03 +0000)]
am
3d7109a1: Merge "EditText - can not drag handles in extracted mode" into mnc-dev
* commit '
3d7109a1f6be56417367ecfdfb2a77c7fe4de3a9':
EditText - can not drag handles in extracted mode
Mady Mellor [Thu, 25 Jun 2015 15:53:59 +0000 (15:53 +0000)]
Merge "Fix: Don't display the drag handles when focus is lost" into mnc-dev
Andrei Stingaceanu [Thu, 25 Jun 2015 15:52:48 +0000 (15:52 +0000)]
Merge "EditText - can not drag handles in extracted mode" into mnc-dev
Andres Morales [Thu, 25 Jun 2015 15:52:35 +0000 (15:52 +0000)]
am
f1900b50: Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev
* commit '
f1900b500f71c372376b5d951d581afcca8d7b57':
[LockSettings] clear secure user id when user is removed
Andres Morales [Thu, 25 Jun 2015 15:43:11 +0000 (15:43 +0000)]
Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev
Mady Mellor [Thu, 25 Jun 2015 15:40:27 +0000 (08:40 -0700)]
Fix: Don't display the drag handles when focus is lost
The text selection handles should be hidden / shown when the window
loses / regains focus.
Additionally renames method to make more sense.
Bug:
22062480
Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
Alex Klyubin [Thu, 25 Jun 2015 15:14:52 +0000 (15:14 +0000)]
am
c781405f: Merge "Use standard copyright banner in android/security/key" into mnc-dev
* commit '
c781405f43ca06041777f2e382c0d5b7bdeac43a':
Use standard copyright banner in android/security/keymaster.
Alex Klyubin [Thu, 25 Jun 2015 15:14:48 +0000 (15:14 +0000)]
am
6223b7e9: Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev
* commit '
6223b7e911b764ed163cb5030fff5f3744724a7f':
Track rename of INT and LONG Keymaster tag types.
Alex Klyubin [Thu, 25 Jun 2015 15:07:27 +0000 (15:07 +0000)]
Merge "Use standard copyright banner in android/security/key" into mnc-dev
Alex Klyubin [Thu, 25 Jun 2015 15:06:47 +0000 (15:06 +0000)]
Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 15:04:20 +0000 (11:04 -0400)]
Fixed a HUN crash with notification children
Notification children were not properly handled
before when added lead to a crash.
This will fix this bug finally.
Bug:
21868047
Change-Id: I92f2f7e71659de8274711a448e370084d423ca9f
Jason Monk [Thu, 25 Jun 2015 14:14:06 +0000 (14:14 +0000)]
am
107cb81f: Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev
* commit '
107cb81f9054a406b94e249c99fd7d64be71faec':
Make BluetoothEventManager listen to ALIAS_CHANGED
Jason Monk [Thu, 25 Jun 2015 14:05:19 +0000 (14:05 +0000)]
Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev
Andrei Stingaceanu [Wed, 24 Jun 2015 10:56:43 +0000 (11:56 +0100)]
EditText - can not drag handles in extracted mode
In TextView's onPreDraw method, startSelectionActionMode()
is called, but the selection has already been started so
in startSelectionActionMode() it shows the
insertionController which hides the selectionController.
Fix this by adding a check to start the action mode only
if it is not already started.
Bug:
22028858
Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
Igor Viarheichyk [Thu, 25 Jun 2015 09:46:17 +0000 (09:46 +0000)]
am
729ffa29: ICU format support for pseudolocalizes.
* commit '
729ffa299ca786eb21ba8330096b33c7bcd66fbf':
ICU format support for pseudolocalizes.
Igor Viarheichyk [Fri, 15 May 2015 01:47:00 +0000 (18:47 -0700)]
ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.
(cherry picked from commit
cbb1e676b56677ae3585c067f29646dddffb4857)
bug:
22060509
Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
Erik Kline [Thu, 25 Jun 2015 05:08:52 +0000 (05:08 +0000)]
am
e42441a2: Merge "Don\'t lose critical success/failure messages" into mnc-dev
* commit '
e42441a232ae1a75cdd2541f974ed8da258b97cd':
Don't lose critical success/failure messages
Svetoslav [Thu, 25 Jun 2015 05:08:38 +0000 (05:08 +0000)]
am
57f2dac7: Merge "iUpdate the sensor group description" into mnc-dev
* commit '
57f2dac721e01ad92843511b142cfc5ed738dda9':
iUpdate the sensor group description
Erik Kline [Thu, 25 Jun 2015 03:46:33 +0000 (03:46 +0000)]
Merge "Don't lose critical success/failure messages" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 02:14:53 +0000 (02:14 +0000)]
Merge "iUpdate the sensor group description" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 02:12:28 +0000 (19:12 -0700)]
iUpdate the sensor group description
bug:
21784262
Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
Winson Chung [Thu, 4 Jun 2015 00:31:39 +0000 (17:31 -0700)]
Refactoring recents search bar widget logic.
Bug:
19062975
Change-Id: I303710598675aeebca8f34ac57de6249462ec033
Anthony Hugh [Thu, 25 Jun 2015 01:43:46 +0000 (01:43 +0000)]
am
2e2d030b: am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
2e2d030bfe3b7ba0f2c2f26e70253494eb94cc1e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:43:42 +0000 (01:43 +0000)]
am
656fd493: Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
* commit '
656fd49386ddd55e0dfe19ae7287413af7fff295':
Make NONEwithECDSA truncate input when necessary.
Andreas Gampe [Thu, 25 Jun 2015 01:43:38 +0000 (01:43 +0000)]
am
8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev
* commit '
8f7ae66e47181ee87985da63d8aa6ef0cad20ab2':
Frameworks/base: Add tracing system properties
Anthony Hugh [Thu, 25 Jun 2015 01:37:28 +0000 (01:37 +0000)]
am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
a50fa71044f759013dc506ae3dc5fce11e67494e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:31:17 +0000 (01:31 +0000)]
Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
Jun Mukai [Thu, 25 Jun 2015 01:31:06 +0000 (18:31 -0700)]
Apply thumbTint and trackTint styles to Switch from xml.
Bug:
21664957
Change-Id: Id08ae89fb1586968df4b901816a8e108bb8570af
Dave Langemak [Thu, 25 Jun 2015 01:30:46 +0000 (01:30 +0000)]
am
ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
* commit '
ecff75a158db0514dc019eb3ec9b3f04c1a8f420':
Revert "Throw IAE on invalid measure spec size"
Andreas Gampe [Thu, 25 Jun 2015 01:29:36 +0000 (01:29 +0000)]
Merge "Frameworks/base: Add tracing system properties" into mnc-dev
Anthony Hugh [Thu, 25 Jun 2015 01:27:41 +0000 (01:27 +0000)]
am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
001df9ca900f3098222a4920a0048d2eb947bd4e':
DO NOT MERGE: Introduce stem keycodes for Wear
Dave Langemak [Thu, 25 Jun 2015 01:17:57 +0000 (01:17 +0000)]
Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
Dave Langemak [Thu, 25 Jun 2015 01:14:26 +0000 (01:14 +0000)]
Revert "Throw IAE on invalid measure spec size"
This reverts commit
ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7.
Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
Amith Yamasani [Thu, 25 Jun 2015 00:38:09 +0000 (00:38 +0000)]
am
3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
* commit '
3704da0d9e45605e0ff38408a30de38b672ff83e':
No need to check WRITE_SETTINGS permission in ContentProvider
Amith Yamasani [Thu, 25 Jun 2015 00:24:18 +0000 (00:24 +0000)]
Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:17:58 +0000 (00:17 +0000)]
am
10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
* commit '
10bf27e2c90f05a8acad3cf902a9bf3ab8dbcca3':
Avoid negative childSpecSize in RelativeLayout
Adam Powell [Thu, 25 Jun 2015 00:17:54 +0000 (00:17 +0000)]
am
91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
* commit '
91feb107f2c7b51bf3cbdef43bea2fb61b56a8ee':
Fix ChooserActivity check for still-alive ChooserTargets
Alan Viverette [Thu, 25 Jun 2015 00:09:05 +0000 (00:09 +0000)]
Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
Adam Powell [Thu, 25 Jun 2015 00:08:52 +0000 (00:08 +0000)]
Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:03:48 +0000 (17:03 -0700)]
Avoid negative childSpecSize in RelativeLayout
Bug:
22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
ztenghui [Wed, 24 Jun 2015 23:44:36 +0000 (23:44 +0000)]
am
93666e86: Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
* commit '
93666e8691c9b41855add5c1c92bfc9e0912764e':
Resize the VectorDrawable according to the virtual Dpi
ztenghui [Wed, 24 Jun 2015 23:32:16 +0000 (23:32 +0000)]
Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
Alan Viverette [Wed, 24 Jun 2015 23:26:41 +0000 (23:26 +0000)]
am
6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
* commit '
6acb521f7c5d13b4f9891822db6121dcedce268a':
Update local state when creating LayerDrawable from constant state
Junda Liu [Wed, 24 Jun 2015 23:26:36 +0000 (23:26 +0000)]
am
e5c7ca7d: Rename and add carrier config keys for volte and ims.
* commit '
e5c7ca7d792f0ecb8219c217d756080d1d4c3933':
Rename and add carrier config keys for volte and ims.
Alan Viverette [Wed, 24 Jun 2015 23:15:14 +0000 (23:15 +0000)]
Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
Tim Murray [Wed, 24 Jun 2015 23:08:43 +0000 (23:08 +0000)]
am
948c6ecc: Merge "add cpuset support" into mnc-dev
* commit '
948c6ecc5a460ce78dc1d012ccb3efc844699985':
add cpuset support