7465 Commits

Author SHA1 Message Date
Alex Klyubin
ceb190edbc am a65101cd: am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev
* commit 'a65101cd49247f792ae05bc31458c73bbcacf6c0':
  Align AndroidKeyStore API with user auth API.
2015-04-29 02:25:54 +00:00
Jeff Brown
c12fc2ae10 am 4b5a7b71: am d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev
* commit '4b5a7b718ed2eec998cb14d36c7d6c84236c2fe6':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
2015-04-29 02:25:49 +00:00
Fabrice Di Meglio
ce9fccc7a6 am e5d4422b: am c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev
* commit 'e5d4422be51a42c96636ada1807e2422fac6fbd1':
  Use Default Browser App for IntentResolution when needed
2015-04-29 02:25:43 +00:00
Amith Yamasani
1476b14086 am 5b9a5fef: am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev
* commit '5b9a5fef6d9d74a09470042b9690d63830417b28':
  Permissions control via profile/device owner admin
2015-04-29 02:25:28 +00:00
Wale Ogunwale
d1a10723a3 am a2166c0a: am 49937b5c: am b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev
* commit 'a2166c0a6a0189d147fc1c529eea585845457f3a':
  @hide resizeableActivity attribute and remove from public api
2015-04-29 02:25:05 +00:00
Yorke Lee
0aa8bf85c5 am dbce6fb8: am f77899f9: am f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev
* commit 'dbce6fb8868c4a053cbc687db993d7a1f20bee7a':
  Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
2015-04-29 02:24:47 +00:00
Adrian Roos
33d82aeac3 am 85b9577e: am dffb90fe: am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
* commit '85b9577e4fd6c8cc3871a81364433078f7517b58':
  Rename windowLightStatusBar
2015-04-29 02:24:16 +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
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
Wale Ogunwale
b1c9539d3f Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev 2015-04-28 23:38:56 +00:00
Wale Ogunwale
a20943188c @hide resizeableActivity attribute and remove from public api
The world is not ready for it ;)

Bug: 20643000
Change-Id: Ia1fbf0450ded8afbd7d876ef2e5ec4eaccb8e6ac
2015-04-28 16:37:19 -07:00
Yorke Lee
f7143ce657 Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev 2015-04-28 23:22:32 +00:00
Yorke Lee
e9d766a312 Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public
These system|signature only permissions must be required by
an InCallService and ConnectionService respectively.

Bug: 20304458
Change-Id: I26156afb610a7f549c0a1a7c01c2096928ef33a7
2015-04-28 16:13:14 -07: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
Adrian Roos
f4f84c98de Rename windowLightStatusBar
Bug: 20642760
Change-Id: If961c758bb034ff9643d7b06a2baafe7307f4051
2015-04-28 13:45:51 -07:00
Zhijun He
69bf60f72a am e2757f52: am 44e5fe6c: am 513f7c33: Camera2: add max capture stall for reprocess
* commit 'e2757f52088831aa08bebc57c591c4844a5db5f9':
  Camera2: add max capture stall for reprocess
2015-04-28 18:39:26 +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
7d200a210b am e18ce45c: am aacb04ca: am 1ce80dc0: Merge "Add some missing Settings and DayNight themes" into mnc-dev
* commit 'e18ce45c135df5d0bd1f6650e79802998bde554d':
  Add some missing Settings and DayNight themes
2015-04-28 15:16:03 +00:00
Raph Levien
cc931dc4e2 am 1872a3dd: am 33d77e18: am a589368a: Merge "Expose drawTextRun publicly" into mnc-dev
* commit '1872a3ddf5f25c62bd5785985d22f4d1f4e22fd9':
  Expose drawTextRun publicly
2015-04-28 15:15:50 +00:00
Julia Reynolds
475b19623f am e7691daf: am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
* commit 'e7691dafecf60906d3d6660c532917466e5c25d1':
  Allow device initializers to set a preferred setup activity.
2015-04-28 15:14:32 +00:00
Alan Viverette
520034755f Add some missing Settings and DayNight themes
Bug: 20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
2015-04-27 23:20:00 +00:00
Raph Levien
c6abf5bff6 Expose drawTextRun publicly
For correct low-level drawing of low level text, a method that
includes context for shaping is necessary, and it's similarly useful
to provide the direction explicitly rather than running the BiDi
algorithm on the text. The drawTextRun method (in both char[] and
CharSequence variants) has provided this functionality for several
major releases but has been internal. This patch exposes the
methods publicly, and also improves the doc strings for both
the new method and some related ones.

Bug: 20193553
Change-Id: I9be33ca5ae3e7db2b69a56298400671d5ef8ad05
2015-04-27 15:33:03 -07:00
fenglu
d515d07336 Merge "API review for requestBandwidthUpdate()" 2015-04-27 20:34:01 +00:00
Julia Reynolds
13c58bacc8 Allow device initializers to set a preferred setup activity.
This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.

Bug: 20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1
2015-04-27 12:57:15 -04:00
Andreas Gampe
0f94fc6f1d Merge "Frameworks/base: Fix a constructor" 2015-04-25 20:16:12 +00:00
Andy Hung
09f9a7adb3 Merge "Hide stretch mode from PlaybackSettings" 2015-04-25 01:28:47 +00:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415'
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
2015-04-25 00:51:47 +00:00
Andy Hung
18cb3b5a27 Hide stretch mode from PlaybackSettings
Different timestretch modes won't be ready for M.

Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
2015-04-24 17:32:57 -07:00
Andy Hung
50c1ed73cd Merge "Unhide new channel masks and deprecate old channel masks" 2015-04-24 23:43:35 +00:00
Jae Seo
344f9e5e9a Merge "TIF: Add TvContentRating constant for unrated content" 2015-04-24 23:41:21 +00:00
Amith Yamasani
bf02d48f4a Merge "More usage tracking" 2015-04-24 23:39:37 +00:00
Arunesh Mishra
b4d533ba53 Merge "Add AudioManager property strings for ultrasound." 2015-04-24 23:29:39 +00:00
Amith Yamasani
f47e51ec60 More usage tracking
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
2015-04-24 16:12:01 -07:00
Yorke Lee
eca706ed9d Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage" 2015-04-24 23:11:42 +00:00
Doris Liu
d34f44028d Merge "Remove distance based animation duration API" 2015-04-24 23:05:01 +00:00
Jens Ole Lauridsen
0525677343 Merge "parcel: Add efficient methods for writing and reading a parcelable." 2015-04-24 22:37:46 +00:00
Etan Cohen
1418054108 Rename removeVideoCallListener to unregisterCallback
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
2015-04-24 15:22:03 -07:00
Lajos Molnar
e0112b51a1 MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7 Merge "MediaSync: add OnErrorListener." 2015-04-24 21:46:22 +00:00
Wei Jia
746306521a MediaSync: add OnErrorListener.
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
2015-04-24 14:32:36 -07:00
Andy Hung
7fdf51b18a Unhide new channel masks and deprecate old channel masks
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
2015-04-24 14:27:21 -07:00
Alex Klyubin
40485f5aac resolved conflicts for merge of f9c14b7d to master
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
2015-04-24 14:21:41 -07:00
Etan Cohen
f9465fb6d2 Merge commit '7e5e791' into merge2
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
2015-04-24 14:05:29 -07:00
Etan Cohen
644f41368f Merge commit '4cb5d80' into merge2 2015-04-24 14:03:28 -07:00
Etan Cohen
4de834eb63 Merge commit 'c91bc62' into merge2 2015-04-24 14:02:45 -07:00