Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,352 Commits 3 Branches 0 Tags
3ed566df593b3f6fdceca169535c1f8fa992fcbe
Commit Graph

49893 Commits

Author SHA1 Message Date
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
 2015-06-19 21:48:37 +00:00
Yorke Lee
abe4a67612 am aad6327d: am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit 'aad6327d3b619e8b34305fefba81010e21bc5eef':
  Don't save cached contact info in call log when adding call
 2015-06-19 21:40:32 +00:00
Chien-Yu Chen
a8f75863f7 am ae599fa0: am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'ae599fa05986863d188055b8d0c568d6097091b3':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 21:40:09 +00: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
3d63af9c4d am bbe35b32: am 0cadef68: am f3e8dca8: Merge "Create ListPopupWindow handler against main looper" into mnc-dev 
* commit 'bbe35b32c2e1843d7d5f0ddde0063a4ead38a497':
  Create ListPopupWindow handler against main looper
 2015-06-19 20:43:42 +00:00
Selim Gurun
981fba5266 am d68ae140: am f714d239: am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'd68ae14015be3a797afbb303324e19897d6b0cdd':
  Clarify handling client certificates
 2015-06-19 20:43:36 +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
Alan Viverette
0204fd6a05 am 9e08cf8f: am 4e537151: am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev 
* commit '9e08cf8f8f05a0da0777408ee8e940622df39e93':
  Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
 2015-06-19 18:56:11 +00:00
Christopher Tate
7e6cbde710 am fdcb8ebb: am 51f9a543: am 7ad40c50: Merge "Debug logging for a certain class of binder transaction failures" into mnc-dev 
* commit 'fdcb8ebb00b5e42dd447a74e80cd51f54e85874c':
  Debug logging for a certain class of binder transaction failures
 2015-06-19 18:56:06 +00: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
c97f8742c8 am 91c0fbd1: am 0b3be03c: am 4186c977: Merge "Don\'t write IntentFilter autoVerify field to xml if false." into mnc-dev 
* commit '91c0fbd126b2a9802f6c58de953e971d74a7d85a':
  Don't write IntentFilter autoVerify field to xml if false.
 2015-06-19 17:10:48 +00: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
6207664de9 am effc89ce: am 22cf22ab: am 33e07bd7: Merge "Camera2: add FACE_PRIORITY_LOW_LIGHT" into mnc-dev 
* commit 'effc89ce51a38159d7b0adc0850678c00683ccce':
  Camera2: add FACE_PRIORITY_LOW_LIGHT
 2015-06-19 16:58:17 +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
Chris Wren
7fbe134325 am 6514204f: am de3d8db7: am 7e786954: Merge "drop corrupt notifications in the Listener" into mnc-dev 
* commit '6514204f3bf651a76ff8b963cae63b7d4e521987':
  drop corrupt notifications in the Listener
 2015-06-19 16:26:29 +00:00
Shawn Willden
883a6c1a4f am fbf4d9a5: am 8b4a02ce: am df0b80e4: Merge "Add new error codes for rate-limit and max-use failures." into mnc-dev 
* commit 'fbf4d9a59436a3a3dc453f1368dff7c875c404f7':
  Add new error codes for rate-limit and max-use failures.
 2015-06-19 16:26:23 +00:00
Abodunrinwa Toki
32e4e77b8d am 54103b79: am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev 
* commit '54103b7968f0817c77a8d7a054adda1673d4b044':
  Fix FloatingToolbar flickers.
 2015-06-19 16:26:05 +00:00
Gustav Sennton
7df7ba0553 am 309c5978: am 05996c10: am 1b48a643: Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 
* commit '309c5978c74d1243ee7968d9393e53d6733b55b2':
  Revert "Load WebView from one out of a list of packages."
 2015-06-19 16:26:00 +00:00
Sudheer Shanka
eb6195c7a2 am eaa25779: am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 
* commit 'eaa2577953eeff27754f6707ac0efa11b77ed947':
  Use the intent filter icon in ResolveInfo for managed profile.
 2015-06-19 16:25:48 +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
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Shawn Willden
4c25a00e83 am bb399afc: am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 
* commit 'bb399afc52375cdadcc1a68ef9032b0957e9f47b':
  Reflect removal of KM_TAG_AEAD_TAG from keymaster.
 2015-06-19 14:18:34 +00:00