drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,059 Commits 1 Branch 0 Tags
Commit Graph

190059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
1775e0b295 am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '16bf47e8d6c9b9b4a9618fef998d6c9808cb17cb':
  Localized Android landing pages Bug: 19124242
 2015-04-29 04:08:29 +00:00
David Friedman
16bf47e8d6 am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '3d983deace20df9437bc9efebc67550f3904eee3':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:51:39 +00:00
David Friedman
3d983deace am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '21a9fa471bcc57196a19e40ca29dbaa97233244c':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:25:15 +00:00
David Friedman
21a9fa471b am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:01:57 +00:00
David Friedman
75f071df44 Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 2015-04-29 02:49:24 +00:00
Alex Klyubin
ecde033065 am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev 
* commit '0838084a3c92d2c64b7eeec6b8a41156977dab59':
  Align AndroidKeyStore API with user auth API.
 2015-04-29 01:45:24 +00:00
Jeff Brown
d5a9ff0e7b am b957a742: Merge changes from topic \'brightness\' into mnc-dev 
* commit 'b957a742b29fa6c7a2eda7d60cf61e8af4668ef8':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
 2015-04-29 01:45:20 +00:00
Fabrice Di Meglio
c55ab0422e am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev 
* commit '46fc110104f3017f23abb397ca817db2be39f1a2':
  Use Default Browser App for IntentResolution when needed
 2015-04-29 01:45:04 +00:00
Christopher Tate
a01fade4c9 am d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev 
* commit 'd6db7eacc983e22eb88fc7b465f290670127569a':
  Don't ostensibly back off fstrim but then do it anyway
 2015-04-29 01:44:56 +00:00
Amith Yamasani
b3c7ad328d am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev 
* commit '7c97a3ddea62a3bd8a95ca51e7b172b209388815':
  Permissions control via profile/device owner admin
 2015-04-29 01:44:50 +00:00
Simranjit Singh Kohli
7374dc3547 am 1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev 
* commit '1f1b88b22bf2d22a1074785132a976bb83a4a1d8':
  AccountsDb Logging]: Introducing logging in accountsDb.
 2015-04-29 01:44:45 +00:00
Mathieu Chartier
1e66f25a16 am 325a5721: Merge "Properly describe exception" into mnc-dev 
* commit '325a57218e9f13cf696215006c230cac34b3c8a1':
  Properly describe exception
 2015-04-29 01:44:41 +00:00
Alan Viverette
837bf24ee4 am e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev 
* commit 'e861c8eb636bea97c1646cc3bfee1cd32670fe61':
  Fix DatePicker max date, disabled day color, and arrow visibility
 2015-04-29 01:44:36 +00:00
Wale Ogunwale
49937b5c46 am b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev 
* commit 'b1c9539d3fa11cf7573ed9faaade4872e1a952f0':
  @hide resizeableActivity attribute and remove from public api
 2015-04-29 01:44:32 +00:00
Jorim Jaggi
15ec725ce2 am b3a020a6: Merge "Fix build." into mnc-dev 
* commit 'b3a020a6de45bbcb1329d8f820e569cfd0de9325':
  Fix build.
 2015-04-29 01:44:20 +00:00
Selim Cinek
3a9c049d03 am 61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev 
* commit '61a75423648a0070406e9b7aeda1a55e173bd467':
  Follow up CL for heads up notification refactoring
 2015-04-29 01:44:14 +00:00
Yorke Lee
f77899f90b am f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev 
* commit 'f7143ce657aa735e92bcbb1287dea4d8a1c82e93':
  Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
 2015-04-29 01:44:08 +00:00
Christopher Tate
25e17ef6d7 am de8c7526: Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev 
* commit 'de8c75263b02cceb2ed223d5099750d83a0b31e9':
  Give scheduled jobs a more substantial timeslice
 2015-04-29 01:44:00 +00:00
Jorim Jaggi
463444fb23 am 420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev 
* commit '420f2688f0ecfafff6b07755e47f0bd0d34b2fc8':
  Only listen for fingerprint if needed.
 2015-04-29 01:43:56 +00:00
Jorim Jaggi
de2aef5a4e am 9a1df486: Merge "Add animation for fingerprint error state" into mnc-dev 
* commit '9a1df48620d07d743f2da5bec2cc9c8a68591c97':
  Add animation for fingerprint error state
 2015-04-29 01:43:51 +00:00
Adam Powell
78cc38d501 am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev 
* commit '4e678ff89d17bc0dbd18517a7187ea385e5e1d53':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets
 2015-04-29 01:43:47 +00:00
Adrian Roos
dffb90fe1b am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev 
* commit 'ca067e9703ab9fcee430d13aac28d04bdc46af2a':
  Rename windowLightStatusBar
 2015-04-29 01:43:35 +00:00
dcashman
2b13a25e4f am fd4e5664: Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev 
* commit 'fd4e5664528f61b7ac2164ec8ec2206da9deebff':
  Fix PackageManagerSettingsTests and add KeySet info.
 2015-04-29 01:43:24 +00:00
Adrian Roos
5fb269e458 am 59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev 
* commit '59a1e117ac00b71756abce44afe96002d4de3fa4':
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils
 2015-04-29 01:43:07 +00:00
Chris Craik
4f66e48de3 am 2f1d09c3: Merge "Use default constructor to get anti-aliasing" into mnc-dev 
* commit '2f1d09c3c5e80e875f588d77bc1e47d317491fa8':
  Use default constructor to get anti-aliasing
 2015-04-29 01:43:02 +00:00
Chris Craik
0e7d1432d4 am ff623a5a: Merge "Remove unused flags and dirty rects" into mnc-dev 
* commit 'ff623a5ab3b26cd98790e355e316a65d76197cbd':
  Remove unused flags and dirty rects
 2015-04-29 01:42:43 +00:00
Tony Mantler
cae5bb3b14 am aadac158: Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev 
* commit 'aadac158bfd533e00b92374afee066bcba22b988':
  Make sure Transition constructor is accessible before invoking
 2015-04-29 01:42:35 +00:00
Luan Nguyen
2787cab72b am 50ea9422: am 4e7500e1: am c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable. 
* commit '50ea942255e139d3ace81cdd3f90be75625edd69':
  docs: Update information on delivering message to clarify that MessageAPI is not reliable.
 2015-04-29 01:42:24 +00:00
Joshua Schwarz
1b8a571c86 am 6bb65f0d: am a4edc82e: am 4547dac0: Fix one-off error in reporting. 
* commit '6bb65f0d837ea9e49238415f907db5ae6da26eca':
  Fix one-off error in reporting.
 2015-04-29 01:42:17 +00:00
Craig Mautner
13302363d5 am 6b3e0587: Merge "Notify client of all window movements." into mnc-dev 
* commit '6b3e0587a052121fd572fd609abcbc75a89d53d6':
  Notify client of all window movements.
 2015-04-29 01:41:56 +00:00
Eino-Ville Talvala
c2b0203a85 am fa1c1f97: Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev 
* commit 'fa1c1f97df601df50b3998f7ae98a2d3bfb03466':
  Camera2: Fix auto-gen documentation crossreferences.
 2015-04-29 01:41:36 +00:00
Alan Viverette
b328bfb1bb am 4703273e: Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev 
* commit '4703273e400981e9ec1bca7e9fbf949b20e91d57':
  Layout layers without intrinsic dimensions using FILL gravity
 2015-04-29 01:41:28 +00:00
Mike Lockwood
1ac9018ac3 am 986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev 
* commit '986da92bdf0d621956d42adc1398c094a034793e':
  MidiFramer: Add support for SysEx messages
 2015-04-29 01:41:21 +00:00
Yorke Lee
e56d3cb2b0 am b7018ba6: Merge "Simplify DefaultDialerManager" into mnc-dev 
* commit 'b7018ba66046097d81c8d3b48e58e6d8aeab893a':
  Simplify DefaultDialerManager
 2015-04-29 01:41:02 +00:00
Paul McLean
62b8677933 am c8240411: Merge "AudioRecord device select continued" into mnc-dev 
* commit 'c8240411c38b78ac8095f6e8067f7bcc7046f502':
  AudioRecord device select continued
 2015-04-29 01:40:52 +00:00
Alex Klyubin
0838084a3c Merge "Align AndroidKeyStore API with user auth API." into mnc-dev 2015-04-29 01:25:32 +00:00
Jeff Brown
b957a742b2 Merge changes from topic 'brightness' into mnc-dev 
* changes:
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
 2015-04-29 01:18:05 +00:00
Jeff Brown
a576b4d3be Add code to collect data about auto-brightness adjustments. 
Write samples of the old and new state to the binary event log whenever
the user modifies the auto-brightness adjustment.  We wait a few seconds
before logging to ensure that the user is satisfied with the adjustment.

Bug: 19786916
Change-Id: I41402decd1034d0839aa0f47495bc00907ab9c08
 2015-04-28 17:53:35 -07:00
Jeff Brown
e7e9ccea32 Add float support to binary event log. 
Bug: 20664753
Change-Id: I90456400b878f943e39cbddec45649662176e2aa
 2015-04-28 17:53:32 -07:00
Fabrice Di Meglio
46fc110104 Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev 2015-04-29 00:42:43 +00:00
Alex Klyubin
1eda77ae21 Align AndroidKeyStore API with user auth API. 
This simplifies the AndroidKeyStore API around user authentication: no
more explicit control over which user authenticators are bound to
which keys.

User-authenticated keys with timeout are unlocked by whatever unlocks
the secure lock screen (currently, password/PIN/pattern or
fingerprint). User-authenticated keys that need authentication for
every use are unlocked by fingerprint only.

Bug: 20526234
Bug: 20642549
Change-Id: I1e5e6c988f32657d820797ad5696797477a9ebe9
 2015-04-28 17:39:30 -07:00
Fabrice Di Meglio
9f7e39fc9d Use Default Browser App for IntentResolution when needed 
- add MATCH_ALL as a new flag for telling that all results need to
be returned (even if there is some sort of filtering done).
- take into account the default Browser App for Intent resolution
- also, dont do any domain verification priming for non system app

See bug #20144393

Change-Id: Iddd1f2029e3bbf3b99ebc5f416dc7f17e5bad10c
 2015-04-28 17:37:18 -07:00
Christopher Tate
d6db7eacc9 Merge "Don't ostensibly back off fstrim but then do it anyway" into mnc-dev 2015-04-29 00:22:30 +00:00
Amith Yamasani
7c97a3ddea Merge "Permissions control via profile/device owner admin" into mnc-dev 2015-04-29 00:17:00 +00:00
Christopher Tate
7618db1038 Don't ostensibly back off fstrim but then do it anyway 
When the mount service isn't up yet, we schedule a retry in the near
future, but then mistakenly go ahead and try (unsuccessfully) to do the
fstrim immediately anyway.  Don't do that.  Furthermore, when in this
situation make sure to preserve knowledge of any completion callback
that may be expecting to hear back about the [eventual] fstrim operation.

Change-Id: Ic7cba37b4f850540f6e448168be0c42418039b01
 2015-04-28 17:15:40 -07:00
Simranjit Singh Kohli
1f1b88b22b Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev 2015-04-29 00:12:29 +00:00
Mathieu Chartier
325a57218e Merge "Properly describe exception" into mnc-dev 2015-04-28 23:47:26 +00:00
Mathieu Chartier
876b7d8fa8 Properly describe exception 
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.

Bug: 20640601

(cherry picked from commit d12065f581defd9e8199593e85aa2036a0713684)

Change-Id: I00126b678ff296e0076247554af8328fe2767038
 2015-04-28 16:46:59 -07:00
Alan Viverette
e861c8eb63 Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev 2015-04-28 23:39:23 +00:00
Wale Ogunwale
b1c9539d3f Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev 2015-04-28 23:38:56 +00:00