Commit Graph

51360 Commits

Author SHA1 Message Date
Alex Klyubin
a65101cd49 am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit 'ecde03306541259d786aeac9a658f440a2e1b098':
  Align AndroidKeyStore API with user auth API.
2015-04-29 02:01:16 +00:00
Jeff Brown
4b5a7b718e am d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit 'd5a9ff0e7bec6d1e4b93fc8475ca18f5ec0256e1':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
2015-04-29 02:01:11 +00:00
Fabrice Di Meglio
e5d4422be5 am c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit 'c55ab0422e4232a0c6bfc3fe5c01dc7d995fcd99':
  Use Default Browser App for IntentResolution when needed
2015-04-29 02:01:06 +00:00
Amith Yamasani
5b9a5fef6d am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
* commit 'b3c7ad328d0a9467ed3864a84ed822720e970334':
  Permissions control via profile/device owner admin
2015-04-29 02:00:50 +00:00
Alan Viverette
8f021114b1 am 837bf24e: am e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev
* commit '837bf24ee4c44d344f6fc5959c758bf3c287e8b3':
  Fix DatePicker max date, disabled day color, and arrow visibility
2015-04-29 02:00:31 +00:00
Adam Powell
57628b6295 am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
* commit '78cc38d5011df42eb8d15eef81a6bef63c5f2eaa':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets
2015-04-29 01:59:44 +00:00
Adrian Roos
85b9577e4f am dffb90fe: am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
* commit 'dffb90fe1baa19c5de6156048420e8988b901949':
  Rename windowLightStatusBar
2015-04-29 01:59:32 +00:00
Adrian Roos
66c6d0e266 am 5fb269e4: am 59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev
* commit '5fb269e4582d97a541eccf39c2484d8d2a8e16ab':
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils
2015-04-29 01:59:18 +00:00
Chris Craik
e01d4b3566 am 4f66e48d: am 2f1d09c3: Merge "Use default constructor to get anti-aliasing" into mnc-dev
* commit '4f66e48de3a66ca41916b897f0898f8eb23aa2ac':
  Use default constructor to get anti-aliasing
2015-04-29 01:59:11 +00:00
Chris Craik
4527289b76 am 0e7d1432: am ff623a5a: Merge "Remove unused flags and dirty rects" into mnc-dev
* commit '0e7d1432d4ef5662c4aa7e89adf3f43a8761f4bd':
  Remove unused flags and dirty rects
2015-04-29 01:59:03 +00:00
Tony Mantler
165c8c4287 am cae5bb3b: am aadac158: Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev
* commit 'cae5bb3b14b569ae51cc719f4f13396e3a475710':
  Make sure Transition constructor is accessible before invoking
2015-04-29 01:58:55 +00:00
Eino-Ville Talvala
7a86a7b813 am c2b0203a: am fa1c1f97: Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev
* commit 'c2b0203a852b9761594235741d27fe9d7046df40':
  Camera2: Fix auto-gen documentation crossreferences.
2015-04-29 01:58:28 +00:00
Mike Lockwood
cb2b34c755 am 1ac9018a: am 986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
* commit '1ac9018ac362adcc526311d4473471105c23ef62':
  MidiFramer: Add support for SysEx messages
2015-04-29 01:58:14 +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
Amith Yamasani
7c97a3ddea Merge "Permissions control via profile/device owner admin" into mnc-dev 2015-04-29 00:17:00 +00: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
Adam Powell
4e678ff89d Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev 2015-04-28 22:59:58 +00:00
Adrian Roos
ca067e9703 Merge "Rename windowLightStatusBar" into mnc-dev 2015-04-28 22:45:01 +00:00
Adam Powell
d974c7b4d1 Fix a bug when constructing a ChooserTargetAdapter without custom
targets

Bug 20667333

Change-Id: Ia35021d12c00f64f5424588f776d79e18e8d518e
2015-04-28 15:41:46 -07:00
Adrian Roos
59a1e117ac Merge changes from topic 'roosa-lpu' into mnc-dev
* changes:
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils
2015-04-28 22:09:42 +00:00
Chris Craik
2f1d09c3c5 Merge "Use default constructor to get anti-aliasing" into mnc-dev 2015-04-28 22:06:17 +00:00
Chris Craik
ff623a5ab3 Merge "Remove unused flags and dirty rects" into mnc-dev 2015-04-28 21:39:49 +00:00
Amith Yamasani
d49489b3af Permissions control via profile/device owner admin
Profile owners and Device owners can set policies for runtime
permissions. Blanket grant/deny policy can be set for a user.
They can also explicitly grant/revoke permissions for specific apps
which cannot be overridden by the user and will not be prompted.

[More implementation required in PackageManagerService and
 PackageInstaller]

Bug: 20666663
Change-Id: I2c25c18c2a195db9023a17716d5896970848bb45
2015-04-28 14:30:09 -07:00
Tony Mantler
ab5d66a96a Make sure Transition constructor is accessible before invoking
b/20666031

Change-Id: Ief519ac00aed8ce84cbc852025f91cc03da90c55
2015-04-28 14:17:06 -07:00
Alan Viverette
5c33949d02 Fix DatePicker max date, disabled day color, and arrow visibility
Day validation moved from the PagerAdapter to the DayPickerView,
which is widget that actually handles the touch interaction and
disabled state for individual days.

Fixed disabled states for primary and secondary activated text
colors. Replaced old light/dark color state lists with themed
versions.

Removed conflicting view visibility changes for managing next and
previous arrows in DayPickerView.

Bug: 20630417
Bug: 20641013
Bug: 20641879
Change-Id: Icdaf02a3b57ec162169c31b8a27ebea908552321
2015-04-28 14:07:36 -07:00
Adrian Roos
f4f84c98de Rename windowLightStatusBar
Bug: 20642760
Change-Id: If961c758bb034ff9643d7b06a2baafe7307f4051
2015-04-28 13:45:51 -07:00
Eino-Ville Talvala
fa1c1f97df Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev 2015-04-28 20:01:55 +00:00
Eino-Ville Talvala
b6eb52ffc5 Camera2: Fix auto-gen documentation crossreferences.
Also update a few outdated notes.

Bug: 20085848
Change-Id: I1aace2152ee937c6c6a4701af999722fdc2e3da7
2015-04-28 12:38:10 -07:00
Mike Lockwood
986da92bdf Merge "MidiFramer: Add support for SysEx messages" into mnc-dev 2015-04-28 19:36:28 +00:00
Mike Lockwood
f26b72dde4 MidiFramer: Add support for SysEx messages
Change-Id: I15a605029a0e89fa75c57f180a5a951ada88461c
2015-04-28 12:35:22 -07:00
Chris Craik
58fc522a69 Use default constructor to get anti-aliasing
Change-Id: I3e078a3bc91a2fd703984ba18b5e7e98069b32f1
2015-04-28 11:49:27 -07:00
Adrian Roos
d6aa6cb0cc Remove LockPatternUtils.getCurrentUser()
Bug: 18931518
Change-Id: I177eefe466c12217cf64c85b872f71bc23c7bf05
2015-04-28 11:49:04 -07:00
Adrian Roos
8150d2a2a1 Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
2015-04-28 11:49:00 -07:00
Yin-Chia Yeh
0671966cab am 1fe9666c: am 5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '1fe9666c669f3fefa5f980983f865f2e6934f0aa':
  Camera: document supported templates
2015-04-28 18:20:09 +00:00
Alan Viverette
c537864580 am e8518e7e: am f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit 'e8518e7ee729597d2b2141c0c4aba695eb529028':
  Fix handling of android:onClick for ContextWrapper
2015-04-28 18:19:58 +00:00
Zhijun He
e2757f5208 am 44e5fe6c: am 513f7c33: Camera2: add max capture stall for reprocess
* commit '44e5fe6c6c241a4f1d46bdb59f45decd756257e4':
  Camera2: add max capture stall for reprocess
2015-04-28 18:19:47 +00:00
Yin-Chia Yeh
5af4cc3922 Merge "Camera: document supported templates" into mnc-dev 2015-04-28 17:55:14 +00:00
Yin-Chia Yeh
0cd24f2c56 Camera: document supported templates
Bug: 20264663
Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
2015-04-28 10:54:31 -07:00
Alan Viverette
f8fdf87c06 Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev 2015-04-28 17:49:20 +00:00
Zhijun He
513f7c33ea Camera2: add max capture stall for reprocess
Bug: 19988710
Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
2015-04-28 17:41:19 +00:00
Alan Viverette
5b276f1c03 am 6af08c6b: Merge "Fix for infinite loop in RemoteViewsAdapter"
* commit '6af08c6b7693b4329184c9cccbc474a0b6a9ea5c':
  Fix for infinite loop in RemoteViewsAdapter
2015-04-28 17:40:05 +00:00
Alan Viverette
6af08c6b76 Merge "Fix for infinite loop in RemoteViewsAdapter" 2015-04-28 17:10:41 +00:00
Chris Craik
956f340aac Remove unused flags and dirty rects
bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
2015-04-28 09:40:01 -07:00
Svet Ganov
7df31b659e am 565d274f: am 340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '565d274f3042c5573fb6fc2623876328f498091e':
  Handle null projection properly if provider app op is not enabled.
2015-04-28 16:32:25 +00:00