Vladislav Kaznacheev
86578bee88
am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
...
* commit '01acdd9feaa1dfe32863b667dd9300240bbc3db7':
Fix huge bounce-back in ListView when double-flinging
2015-06-22 09:46:30 +00:00
Vladislav Kaznacheev
8228e4247c
Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
2015-06-22 09:30:20 +00:00
Bart Sears
48f94aac65
am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev
...
* commit '1b96f013a02409195278be23a19d57289f26c7fe':
Revert "Clarify handling client certificates"
2015-06-20 05:46:13 +00:00
Bart Sears
950aa197d4
Merge "Revert "Clarify handling client certificates"" into mnc-dev
2015-06-20 05:22:39 +00:00
Bart Sears
4ead33300f
Revert "Clarify handling client certificates"
...
CL broke the javadoc build.
This reverts commit 36cf701e1e .
Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
2015-06-20 05:21:38 +00:00
Paul Jensen
2e2cc43e33
am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
...
* commit 'ae6d0354677221fb988a76f2f26c064c167283da':
Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
2015-06-20 01:33:24 +00:00
Paul Jensen
2f56a33041
Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
2015-06-20 01:13:18 +00:00
Doris Liu
ec92ea3946
am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
...
* commit '5bfdb772f68256480fbcbb5161bb079b60f2d8bf':
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
2015-06-20 00:47:12 +00:00
Doris Liu
4a79992591
Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
2015-06-20 00:23:30 +00:00
Doris Liu
bcfdead943
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
...
The issue states that NumberPicker.setWrapSelectorWheel(false) only works
in a specific call order. The underlying problem is that NumberPicker
does not remember user's preference on whether the selector wheel should
be wrapped. Therefore, it only works when user sets their preference last,
after everything else that could affect the choice gets executed.
Bug: 19049714
Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
2015-06-19 16:33:39 -07:00
Svet Ganov
27479b5752
am f5da7202: am 1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev
...
* commit 'f5da72021b1855cc6b6b5819b4611152fdc968c4':
Only grant runtime permissions to special components.
2015-06-19 22:48:29 +00:00
Amith Yamasani
5f1c2dbcfd
am 97d2493f: am b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev
...
* commit '97d2493f1a737158f489f4ff9e38e5c19f798bde':
App Standby : Association between content providers and their sync adapter
2015-06-19 22:28:24 +00:00
Svet Ganov
1e575a0f32
Merge "Only grant runtime permissions to special components." into mnc-dev
2015-06-19 22:26:32 +00:00
Svet Ganov
adc1cf4604
Only grant runtime permissions to special components.
...
Now runtime permissions are granted only to components that are
part of the system or perform special system operations. For
exmple, the shell UID gets its runtime permissions granted by
default and the default phone app gets the phone permissions
granted by default.
bug:21764803
Change-Id: If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
2015-06-19 15:17:56 -07:00
Amith Yamasani
b94761d0a4
Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev
2015-06-19 22:08:13 +00:00
Amith Yamasani
37a40c24de
App Standby : Association between content providers and their sync adapter
...
Set sync adapters to active if the associated content providers are used
at foreground process state.
Minimize how frequently published content providers are reported by
keeping track of last reported time.
Also cache sync adapters associated with an authority in SyncManager.
Bug: 21785111
Change-Id: Ic2c8cb6a27f005d1a1d0aad21d36b1510160753a
2015-06-19 15:04:58 -07:00
Adam Lesinski
52e7f8c76f
am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev
...
* commit 'bd9b25efb8cdaa4772f730259418d66ba58beb40':
BatteryStats: Record doze wake locks
2015-06-19 21:39:57 +00:00
Yorke Lee
aad6327d3b
am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev
...
* commit '495cac604d3c935fe23e0d73be5a750528106e41':
Don't save cached contact info in call log when adding call
2015-06-19 21:23:27 +00:00
Chien-Yu Chen
ae599fa059
am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev
...
* commit 'befbd42211c8d47c02f08db107f9bc18be8576c6':
ImageReader: Fix format workarounds for legacy devices
2015-06-19 21:22:58 +00:00
Adam Lesinski
b6a092990c
Merge "BatteryStats: Record doze wake locks" into mnc-dev
2015-06-19 21:13:43 +00:00
Adam Lesinski
9425fe21c9
BatteryStats: Record doze wake locks
...
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.
Bug:21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
2015-06-19 14:12:01 -07:00
Yorke Lee
c723b8d742
Merge "Don't save cached contact info in call log when adding call" into mnc-dev
2015-06-19 20:47:08 +00:00
Alan Viverette
bbe35b32c2
am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev
...
* commit '0cadef68e480ce57592928a200d0b437c2440886':
Create ListPopupWindow handler against main looper
2015-06-19 20:29:57 +00:00
Selim Gurun
d68ae14015
am f714d239: am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev
...
* commit 'f714d23908eea3d73de3799cdaa0d54b1fe56326':
Clarify handling client certificates
2015-06-19 20:29:45 +00:00
Chien-Yu Chen
be2e38e01c
Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev
2015-06-19 19:51:42 +00:00
Alan Viverette
f3e8dca84b
Merge "Create ListPopupWindow handler against main looper" into mnc-dev
2015-06-19 19:21:11 +00:00
Yorke Lee
457df5ff7e
Don't save cached contact info in call log when adding call
...
Bug: 20520236
Change-Id: I8ca051d4b93624b51de73640544ee5c6afbc0b7a
2015-06-19 12:01:05 -07:00
Selim Gurun
8d79e36c88
Merge "Clarify handling client certificates" into mnc-dev
2015-06-19 18:48:49 +00:00
Selim Gurun
36cf701e1e
Clarify handling client certificates
...
Bug: 21910771
Clarify handling client certificates when using a webview. This is a
documentation change only.
Change-Id: Ifcd7c2c9fffc79c1dcc162d829dfbb175cddaa11
2015-06-19 11:46:29 -07:00
Alan Viverette
9e08cf8f8f
am 4e537151: am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
...
* commit '4e537151351e14cd2bc9c30934bac8e8a3010432':
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
2015-06-19 18:41:21 +00:00
Christopher Tate
fdcb8ebb00
am 51f9a543: am 7ad40c50: Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev
...
* commit '51f9a5433df5663af4ba32061ae0cbf426e07f23':
Debug logging for a certain class of binder transaction failures
2015-06-19 18:41:16 +00:00
David Srbecky
f32f7a3ffd
Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev
2015-06-19 18:26:42 +00:00
Alan Viverette
7c669f4547
Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
2015-06-19 18:20:21 +00:00
Alan Viverette
9355533bf6
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
...
This reverts commit 3e2e064a1f .
Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f
2015-06-19 18:19:56 +00:00
Christopher Tate
7ad40c5032
Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev
2015-06-19 18:19:15 +00:00
Christopher Tate
8a2ce3c751
Debug logging for a certain class of binder transaction failures
...
Bug 21801759
Change-Id: I9973d4ffb9450e510a4e1c64e2eae1489ce93054
2015-06-19 11:17:24 -07:00
Wale Ogunwale
91c0fbd126
am 0b3be03c: am 4186c977: Merge "Don\'t write IntentFilter autoVerify field to xml if false." into mnc-dev
...
* commit '0b3be03c29ee46838af6ee7e436f3bc935dc7288':
Don't write IntentFilter autoVerify field to xml if false.
2015-06-19 16:59:11 +00:00
Zhijun He
effc89ce51
am 22cf22ab: am 33e07bd7: Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev
...
* commit '22cf22abef853e80d1c90302e6f0f3d646091e42':
Camera2: add FACE_PRIORITY_LOW_LIGHT
2015-06-19 16:44:32 +00:00
Wale Ogunwale
4186c977eb
Merge "Don't write IntentFilter autoVerify field to xml if false." into mnc-dev
2015-06-19 16:36:00 +00:00
Zhijun He
33e07bd730
Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev
2015-06-19 16:23:42 +00:00
Chris Wren
6514204f3b
am de3d8db7: am 7e786954: Merge "drop corrupt notifications in the Listener" into mnc-dev
...
* commit 'de3d8db77c7895a51190b116fcba174d5462b434':
drop corrupt notifications in the Listener
2015-06-19 16:15:35 +00:00
Shawn Willden
fbf4d9a594
am 8b4a02ce: am df0b80e4: Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev
...
* commit '8b4a02cef4d7fa346e68d580807b58bf273c3ced':
Add new error codes for rate-limit and max-use failures.
2015-06-19 16:15:31 +00:00
Abodunrinwa Toki
54103b7968
am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev
...
* commit '2508c6dfafaa71c190b4d0a7346f6a579985bde7':
Fix FloatingToolbar flickers.
2015-06-19 16:14:54 +00:00
Gustav Sennton
309c5978c7
am 05996c10: am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev
...
* commit '05996c10ccf30fafdf88926b46b7f2e329d0b243':
Revert "Load WebView from one out of a list of packages."
2015-06-19 16:14:47 +00:00
Sudheer Shanka
eaa2577953
am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
...
* commit 'a0fa30dc24cfc838deb8919cf6ff7bdea5736b57':
Use the intent filter icon in ResolveInfo for managed profile.
2015-06-19 16:14:33 +00:00
Zhijun He
ee2ebdedcc
Camera2: add FACE_PRIORITY_LOW_LIGHT
...
Add FACE_PRIORITY_LOW_LIGHT to allow higher sensitivity value AE under low
light.
Also fix some minor doc issue for high speed recording capability.
Bug: 21813977
Change-Id: I965ece936c1bc3d3cb370454e950fde4aad06335
2015-06-19 09:13:37 -07:00
Wale Ogunwale
15b9fd268a
Don't write IntentFilter autoVerify field to xml if false.
...
Bug: 21205789
Change-Id: I650265eeec99d470ae2f089d8ae3ef3c866c0096
2015-06-19 08:59:52 -07:00
Chris Wren
7e786954e5
Merge "drop corrupt notifications in the Listener" into mnc-dev
2015-06-19 15:15:22 +00:00
Shawn Willden
df0b80e4e1
Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev
2015-06-19 15:13:22 +00:00
Shawn Willden
91526c1430
Add new error codes for rate-limit and max-use failures.
...
Bug: 21607106
Change-Id: Ia0527341f98726bf74c2bfddd9b9a82974fab954
2015-06-19 09:07:13 -06:00