Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,953 Commits 3 Branches 0 Tags
ec1f0145fbedaee2e79e761e0ea25b4fef91b658
Commit Graph

10518 Commits

Author SHA1 Message Date
Dan Sandler
ec1f0145fb am a89899a3: am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev 
* commit 'a89899a3241008679cf1c37651ea8bf9adc65ecd':
  Icon: a clean, parcelable place for images.
 2015-05-01 18:30:58 +00:00
Dan Sandler
9fc943d1a6 Merge "Icon: a clean, parcelable place for images." into mnc-dev 2015-05-01 17:57:14 +00:00
Dan Sandler
b9f7aac348 Icon: a clean, parcelable place for images. 
Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470
 2015-05-01 13:44:42 -04:00
Amit Mahajan
a1f8ba01f3 am 5eac90f9: am c23975da: am 13a98b6c: Support for bearer_bitmask. 
* commit '5eac90f93fd0214012a3c039422b4dcdfad97eef':
  Support for bearer_bitmask.
 2015-05-01 17:22:27 +00:00
Amit Mahajan
13a98b6c6e Support for bearer_bitmask. 
Change-Id: I7cae3d229445607c66b6472124264588f7571097
 2015-05-01 16:40:56 +00:00
Lorenzo Colitti
0c12125e00 am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 04:19:07 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev 
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
 2015-05-01 03:45:14 +00:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK. 
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
 2015-05-01 12:36:28 +09:00
Andrew Lee
10821f9920 am c493f43f: am 972e0c7b: am 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev 
* commit 'c493f43fe1f0b7b1ed62ae85065d7c8f66803273':
  Add handler parameter for callbacks.
 2015-05-01 01:34:19 +00:00
Todd Kennedy
6b379c8a34 am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev 
* commit '9c14b3ab0d6e42031d0465114a979b644c6890d2':
  Remove dependency upon FragmentActivity
 2015-05-01 01:32:25 +00:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master 
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
 2015-04-30 16:17:16 -07:00
Andrew Lee
011728fc3a Add handler parameter for callbacks. 
Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
 2015-04-30 15:24:50 -07:00
Todd Kennedy
a5fc6f006f Remove dependency upon FragmentActivity 
The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.

Bug: 19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd
 2015-04-30 12:52:32 -07:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View 
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
 2015-04-30 09:58:35 -07:00
Jim Miller
b62dc82b0c Add javax.crypto.Mac as a supported CryptoObject to Fingerprint 
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit 0ecd5c20d9)
 2015-04-30 01:53:11 +00:00
Alex Klyubin
83bd0088e1 Merge "Add javax.crypto.Mac as a supported CryptoObject to Fingerprint" 2015-04-30 01:52:40 +00:00
Jim Miller
0ecd5c20d9 Add javax.crypto.Mac as a supported CryptoObject to Fingerprint 
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
 2015-04-29 18:51:19 -07:00
Maxim Bogatov
aba56b648f Merge "Add accessibility actions for scrolling in different directions" 2015-04-30 01:16:02 +00:00
Miao Wang
d0a4020223 am 4ea4af04: am 5545d518: am 508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev 
* commit '4ea4af0464c3782f10e78aa8af5f59e1b752fc22':
  [RenderScript] Enable L2 BLAS APIs
 2015-04-30 00:42:27 +00:00
Miao Wang
5457c167c0 am 6c57c327: am e2341e2b: am 634160a0: Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev 
* commit '6c57c32708ccc6bb071f78e1c3756f6a4edc7459':
  [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
 2015-04-30 00:42:16 +00:00
Alex Klyubin
ee4bd11c4c am 8fa0eecc: am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev 
* commit '8fa0eecc4fa569fe89273ddb3234f03bf1c567ec':
  Add KeyPermanentlyInvalidatedException.
 2015-04-30 00:27:21 +00:00
Miao Wang
508a2870e9 Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev 2015-04-30 00:07:30 +00:00
Miao Wang
634160a056 Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'" into mnc-dev 2015-04-30 00:04:12 +00:00
Alex Klyubin
33c9dde90d Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev 2015-04-29 23:48:14 +00:00
Simranjit Singh Kohli
4010631b49 am 7b21b4cb: am 850c1888: am 490d23bf: Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev 
* commit '7b21b4cb238621760d57fbb3b974bc53bac8937b':
  [Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
 2015-04-29 23:39:58 +00:00
Simranjit Singh Kohli
490d23bf55 Merge "[Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes." into mnc-dev 2015-04-29 23:13:34 +00:00
Svet Ganov
208b2c3b9a am 2c372ef0: am 104a23c5: am e3538083: Merge "Add API to get app op for a permission" into mnc-dev 
* commit '2c372ef0240c5f1444d118b046e66c9f35fec28a':
  Add API to get app op for a permission
 2015-04-29 21:51:56 +00:00
Mike Lockwood
4e17165287 am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev 
* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
  MidiDeviceInfo: Add version string property
 2015-04-29 21:26:01 +00:00
Svet Ganov
e35380839e Merge "Add API to get app op for a permission" into mnc-dev 2015-04-29 21:15:25 +00:00
Mike Lockwood
ec317987e0 am 94582c5f: am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 
* commit '94582c5fb632b17b751729a929ff94ef8aa216a1':
  UsbDevice: Add support for retrieving version string for a USB device
 2015-04-29 21:02:30 +00:00
Junda Liu
a7a6708510 am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 
* commit '01da31247b8b2999bcfefe1f55ca396ee177ad69':
  Moving all Telephony overlays to CarrierConfigManager.
 2015-04-29 21:02:25 +00:00
Mike Lockwood
e1d003958d Merge "MidiDeviceInfo: Add version string property" into mnc-dev 2015-04-29 20:50:35 +00:00
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property 
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
 2015-04-29 13:44:34 -07:00
Mike Lockwood
f105f61dd9 Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 2015-04-29 20:27:50 +00:00
Jonathan Basseri
9b56ad8f1a Moving all Telephony overlays to CarrierConfigManager. 
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
 2015-04-29 13:23:21 -07:00
Mike Lockwood
c9bb40ea95 UsbDevice: Add support for retrieving version string for a USB device 
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
 2015-04-29 13:05:55 -07:00
Alex Klyubin
708fc94045 Add KeyPermanentlyInvalidatedException. 
This enables users of AndroidKeyStore crypto to differentiate between
the key being unusable until the user is authenticated
(UserNotAuthenticatedException) and the key being permanently unusable
(KeyPermanentlyInvalidatedException). The latter is the case when the
secure lock screen has been disabled or reset, and, for keys that
require user authentication for every use, when a new fingerprint is
enrolled or all fingerprints are unenrolled.

NOTE: The KeyPermanentlyInvalidatedException subsumes/replaces the
NewFingerprintEnrolledException which has thus been removed. There
is no way to find out whether a key was permenently invalidated
specifically because a new fingerprint was added.

Bug: 20642549
Bug: 20526234
Change-Id: I0206cd99eef5c605c9c4d6afc5eea02eb3b1fe6b
 2015-04-29 12:44:10 -07:00
destradaa
cbba357159 am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev 
* commit '2c160c1a64a696dcb6261311ca0a406a07231d33':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
 2015-04-29 18:34:18 +00:00
destradaa
c0667853ff Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev 2015-04-29 18:01:05 +00:00
Cedric Ho
a02ac06b90 am 94ae5f3c: am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev 
* commit '94ae5f3c089e9bdd39011dacc09411058ddc4a6e':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
 2015-04-29 17:59:37 +00:00
Cedric Ho
80fa2cc8a9 Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev 2015-04-29 17:19:40 +00:00
Svet Ganov
fbf01f7796 Add API to get app op for a permission 
Change-Id: Id75d8fca6654c694fb78d1b4a3564b01e90a4e78
 2015-04-29 08:30:48 -07:00
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