Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,930 Commits 3 Branches 0 Tags
ab06b4b46dad7bc59b6529440f48ed03ed8459a0
Commit Graph

49203 Commits

Author SHA1 Message Date
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
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
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Shawn Willden
bb399afc52 am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 
* commit '687b32591b29442a5c2d181e7acd72a94ce93eab':
  Reflect removal of KM_TAG_AEAD_TAG from keymaster.
 2015-06-19 13:59:03 +00:00
Dianne Hackborn
50bf0203b9 am 1594edce: am 0348ba2e: Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
  Fix issue #20494208: Go out of device idle when headset button is pressed
 2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
  BatteryStats: Fix regression in wakelock power distribution
 2015-06-19 13:58:09 +00:00
Dan Sandler
2a0cc6cf4d am 7a7e8fc8: am 11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev 
* commit '7a7e8fc83c5b362427aa061002e928ab7f7721cf':
  Announce chronometers with time-unit words.
 2015-06-19 13:58:04 +00:00
Gustav Sennton
1b48a6430a Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 2015-06-19 13:23:52 +00:00
Gustav Sennton
d973018221 Revert "Load WebView from one out of a list of packages." 
This was not a clean revert!

This reverts commit 2ed6fee15c.
We essentially only revert the functionality for going through a list of
WebView package names and picking the first compatible one.
Except for that functionality we also fetched the name of the shared
library from a flag in WebView and made some minor refactoring in the
initial commit, these changes have been left alone in this revert.

Bug: 21893371
Change-Id: Idb2539dc33cc5f9e2894ecd665c23573c6cba9f3
 2015-06-19 11:38:56 +01:00
Sudheer Shanka
a408061cc7 Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 2015-06-19 09:25:59 +00:00
Shawn Willden
0961480879 Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 2015-06-19 03:16:55 +00:00
Alex Klyubin
42abb74834 Reflect removal of KM_TAG_AEAD_TAG from keymaster. 
This reflects the changes in da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.

Bug: 19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
 2015-06-18 18:43:45 -07:00
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info. 
This follows a change in dex2oat.

(cherry picked from commit f39477b592)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
 2015-06-19 02:20:06 +01:00
Dianne Hackborn
0348ba2e23 Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575 Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 2015-06-19 00:57:47 +00:00
Dan Sandler
11859eba4e Merge "Announce chronometers with time-unit words." into mnc-dev 2015-06-19 00:50:59 +00:00
Dianne Hackborn
b6683c4286 Fix issue #20494208: Go out of device idle when headset button is pressed 
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.

Change-Id: Ie58de60e63036a4142881283835961fbcceec892
 2015-06-18 17:40:33 -07:00
Alan Viverette
4a50723fe3 Create ListPopupWindow handler against main looper 
Required for CTS tests.

Bug: 21664698
Change-Id: Id33c672d7d50a2162c519249bbbf5b8081faf830
 2015-06-18 17:11:19 -07:00
Christopher Tate
ff69c55eb0 am 528e9abe: am 728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev 
* commit '528e9abeef938179f58714cc3fea4bb8362fd9b6':
  Document possible null returns in PackageManager
 2015-06-18 21:09:39 +00:00
Christopher Tate
728b7500b3 Merge "Document possible null returns in PackageManager" into mnc-dev 2015-06-18 20:53:12 +00:00
Christopher Tate
abe6580199 Document possible null returns in PackageManager 
In particular queryIntentServices() but also a few others.

Bug 19127758

Change-Id: I590605ce4870b2ab300385678df8917cfade60f9
 2015-06-18 13:48:42 -07:00