Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
186,429 Commits 3 Branches 0 Tags
b67cd46436d3ee88ee42820fca9a8fe3cd2dc497
Commit Graph

50409 Commits

Author SHA1 Message Date
Ying Wang
b67cd46436 Fix build. 
private class SearchIndexablesContract.BaseColumns is extended by public
classes. We need to make it public too.

Change-Id: Id77575f7857020531b9d311ca5ba12c6462268a5
 2015-03-30 15:46:30 -07:00
Fabrice Di Meglio
71036a89e6 Merge "Make Settings search API as a SystemAPI" 2015-03-30 21:57:23 +00:00
Makoto Onuki
dc0078b794 Merge "Revert "Enterprise quick contact 1/2"" 2015-03-30 20:43:19 +00:00
Makoto Onuki
4fd8d4ab2a Revert "Enterprise quick contact 1/2" 
This reverts commit 75a0882b94.

Change-Id: Ibe332885824b228bf1b1147d141c9395554ff67f
 2015-03-30 20:42:20 +00:00
Ed Heyl
7298d1f079 Merge "Fix build: Revert "Record hyphens from Minikin and draw them"" 2015-03-30 20:35:58 +00:00
Ed Heyl
5a6eeb3cbe Fix build: Revert "Record hyphens from Minikin and draw them" 
This reverts commit 27fb878c04e18d3bdd6c42ed347194a7c816ed97.

Change-Id: I2b3390cb0b258a2e1a38ad72ae9686177d6ffdb8
 2015-03-30 20:34:02 +00:00
Chad Brubaker
021a1e090a am 7081a168: am 5341d83c: am f603e286: Merge "Add authorization binder methods" 
* commit '7081a16859cdcf32f565379a8179ddc7b50b3c1d':
  Add authorization binder methods
 2015-03-30 20:33:55 +00:00
Chad Brubaker
5341d83c3e am f603e286: Merge "Add authorization binder methods" 
* commit 'f603e2861430f13a746f80885b5fc00994f64391':
  Add authorization binder methods
 2015-03-30 20:18:34 +00:00
Chad Brubaker
f603e28614 Merge "Add authorization binder methods" 2015-03-30 20:06:39 +00:00
Jason Monk
b730035761 Merge "Add constant for manage permissions screen" 2015-03-30 19:54:00 +00:00
John Reck
c74e289a65 Merge "Add GraphicsStatsService" 2015-03-30 19:39:27 +00:00
Alan Viverette
6199bffef2 Merge "Deprecate AnalogClock widget, Integer methods on TimePickerView" 2015-03-30 19:37:43 +00:00
Alan Viverette
27616de47b Merge "Fix ViewRootImpl handling of content changes, fix ViewPager parenting" 2015-03-30 19:36:30 +00:00
Raph Levien
683ab2afc5 Merge "Record hyphens from Minikin and draw them" 2015-03-30 19:34:11 +00:00
Fabrice Di Meglio
27e1334734 Make Settings search API as a SystemAPI 
See: http://b/19443752

Change-Id: I0148f187eec57a2734d8c04880a5950e9ec2b7b1
 2015-03-30 12:32:09 -07:00
Makoto Onuki
b13f44bc6e Merge "Enterprise quick contact 1/2" 2015-03-30 19:24:42 +00:00
Alan Viverette
34457f51e0 Fix ViewRootImpl handling of content changes, fix ViewPager parenting 
Previously content changes were only handled if they came directly from
the focused host, which meant that changes that occurred higher in the
tree were ignored. As a result, scrolling in ViewPager that contained
virtual nodes would fail to update the focus position.

Change-Id: I028bd8c670f1210339da331626e1986c5b5d4b87
 2015-03-30 12:15:25 -07:00
Alan Viverette
60b674e07b Clean up date picker attributes, add carets 
Bug: 19819283
Bug: 19431364
Change-Id: Idd66f4ceb99d598c0f256d85c43bff6e25ccdd8f
 2015-03-30 12:15:25 -07:00
Jason Monk
ed0343c911 Add constant for manage permissions screen 
This screen is not per app, but shows all runtime permissions and
how many apps hold each.

Change-Id: I68cdbe53177f742daf396f4eb53761fd5cda2636
 2015-03-30 14:42:02 -04:00
Chris Wren
469d94490e Merge "add a mechanism for logging actions" 2015-03-30 18:31:44 +00:00
Chris Wren
4902da45a7 add a mechanism for logging actions 
Change-Id: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
 2015-03-30 14:29:03 -04:00
Alan Viverette
523fe91af4 Merge "Clean up time picker attributes and drawing code" 2015-03-30 17:27:03 +00:00
Mike Lockwood
e9e02d5235 Merge "Move MIDI utilities for internal use to com.android.internal.midi package" 2015-03-30 17:26:03 +00:00
Mike Lockwood
d1b16fe2fb Move MIDI utilities for internal use to com.android.internal.midi package 
Change-Id: I7393ae1d4bca61667fb6ee809a7aa22c5c48de56
 2015-03-30 09:06:06 -07:00
Clara Bayarri
dff34599c2 Merge "Editor: Cleanup the unused ActionPopupWindow" 2015-03-30 08:59:11 +00:00
Mathieu Chartier
f37c099c70 am 2169c68a: am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit '2169c68aa330670ab340ec7faaedb5e5a9a59360':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-30 00:36:51 +00:00
Mathieu Chartier
d9dddea504 am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-29 22:42:53 +00:00
Mathieu Chartier
631565abd6 Merge "Change getDeclaredFieldsUnchecked call to new return value" 2015-03-29 22:30:41 +00:00
Mike Lockwood
549a8cb66d Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature" 2015-03-28 16:00:21 +00:00
Andreas Gampe
822b403b68 am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:18:14 +00:00
Andreas Gampe
2d3455993e am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '1bca3532687675d81dea805b12577a6c3a00b4c3':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:18:03 +00:00
Andreas Gampe
d7fb6d26d8 am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:03:25 +00:00
Andreas Gampe
0e6b4da5ca am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:03:18 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value 
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
 2015-03-27 18:55:50 -07:00
Makoto Onuki
75a0882b94 Enterprise quick contact 1/2 
Now openQuickContact goes thorough DPM.  When a lookup URI is build with
a lookup key returned by the enterprise lookup APIs for a corp contact, the
lookup key will have a special prefix.  In that case we go through DPM
and have it launch QC on the managed profile, if the policy allows.

For now we use the same DPM policy as enterprise-caller-id to disable this.

Design doc: go/cp2-mnc-enterprise-dd

Bug 19546108

Change-Id: I4840e7fad8a6a60249df07d993d26d03619650d4
 2015-03-27 17:19:01 -07:00
Christopher Tate
6e6af0d34e Merge "Add payload-size preflight stage to full transport backup" 2015-03-27 23:50:58 +00:00
Alex Klyubin
7760820ecc am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore." 
* commit '23c2b8e81ec5a6e0c344f09e728d87300ac29bc2':
  Symmetric key generation for AndroidKeyStore.
 2015-03-27 23:49:25 +00:00
Chad Brubaker
2fb1d0eb20 am db22c659: am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to some operations" 
* commit 'db22c6595c1b1949ff5473517609a7315b8e130f':
  Allow entropy to be provided to some operations
 2015-03-27 23:49:17 +00:00
Alex Klyubin
d7e0610477 am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore." 
* commit '36ee836d2f6e6df59d6a20a69421639bacf25559':
  Symmetric key generation for AndroidKeyStore.
 2015-03-27 23:26:08 +00:00
Chad Brubaker
3e89fac569 am dbd9a4b6: Merge "Allow entropy to be provided to some operations" 
* commit 'dbd9a4b651aed25a50976ca0a68a979cc3f299fa':
  Allow entropy to be provided to some operations
 2015-03-27 23:25:59 +00:00
Alex Klyubin
d23a1f706f Symmetric key generation for AndroidKeyStore. 
This currently supports AES and HMAC with SHA-256.

Bug: 18088752
Change-Id: Ife55438cf4129b895295681bb35091cd37eb73fb
 2015-03-27 15:57:53 -07:00
Elliott Hughes
6fd63402f5 Merge "Document that Time doesn't support pseudo-zones." 2015-03-27 22:45:09 +00:00
Adrian Roos
a6f428545c Merge "Add emergency assistance API and setting" 2015-03-27 22:18:40 +00:00
Elliott Hughes
5c955ee541 Document that Time doesn't support pseudo-zones. 
Bug: 19110194
Change-Id: I653b7dc46d5f15da70435f6bddd49042f4d03b54
 2015-03-27 15:18:12 -07:00
Yin-Chia Yeh
c889098e46 Merge "Camera: codegen doc update" 2015-03-27 21:50:42 +00:00
Yin-Chia Yeh
d49ebcc3ad Camera: codegen doc update 
Bug: 19966527
Change-Id: I47c450d5661374c0a51d02bb79fccff1d26338f7
 2015-03-27 14:48:45 -07:00
Chad Brubaker
dae79e5408 Allow entropy to be provided to some operations 
generateKey and begin can now optionally take an array of bytes to add
to the rng entropy of the device before the operation. If entropy is
specified and the device does not support add_rng_entropy or the call
fails then that device will not be used, leading to fallback or error
depending on the situation.

Change-Id: Id7d33e3cc959594dfa5483d002993ba35c1fb134
 2015-03-27 14:28:35 -07:00
Adrian Roos
943eb8654f Add emergency assistance API and setting 
Bug: 19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
 2015-03-27 21:26:46 +00:00