summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaSync: address API review." into mnc-devWei Jia2015-05-082-48/+48
|\
| * MediaSync: address API review.Wei Jia2015-05-082-48/+48
| | | | | | | | | | | | | | | | Rename *Settings to *Params; Remove size parameter from MediaSync.queueAudio(); Bug: 20887706 Change-Id: I4c572da92ada51458031a482b96b3f624224e608
* | Merge "Remove restrictions PIN functionality" into mnc-devFyodor Kupolov2015-05-082-2/+2
|\ \
| * | Remove restrictions PIN functionalityFyodor Kupolov2015-05-062-2/+2
| | | | | | | | | | | | | | | Bug: 20852231 Change-Id: I5666ee28ff1341ead9b258bc0852d8ba6d313c5e
* | | Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-devAlex Klyubin2015-05-082-2/+2
|\ \ \
| * | | Document when encrypted AndroidKeyStore keys are wiped.Alex Klyubin2015-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also drops the boolean parameter from KeyGeneratorSpec.Builder.setEncryptionRequired to match the already launched KeyPairGeneratorSpec.Builder.setEncryptionRequired. Bug: 18088752 Change-Id: I91a3e8c77958971b1bda8329319f1a0d8043b669
* | | | Merge "media: merge CodecException's getErrorCode and getReason." into mnc-devRonghua Wu2015-05-082-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | media: merge CodecException's getErrorCode and getReason.Ronghua Wu2015-05-082-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And unhide getErrorCode. Bug: 20950388 Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
* | | | Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-devJohn Spurlock2015-05-082-38/+44
|\ \ \ \
| * | | | Zen: Simplify notification policy api, add zenmode api.John Spurlock2015-05-082-38/+44
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the concept of a notification policy management token in favor of a simple grant/deny per app. Currently, all requests are immediately granted. - Add zen mode getter/setting, limit to apps that have been granted policy access. - Add intent for zen mode changes. - Public name for zen mode = "interruption filter", moved from NotificationListenerService to NotificationManager. - Add settings metadata for new DND access Settings screen. - Add the split sender settings for calls vs messages to the public Policy api. - This change is meant to finalize the public api, persisting granted app status and showing the user-visible dialog will be done as followups. Bug: 18298798 Change-Id: I511be98d69939f057c0c7dc1a6dfe63d1c468193
* | | | Merge "DeviceInitializerStatus API review changes" into mnc-devCraig Lafayette2015-05-082-10/+4
|\ \ \ \
| * | | | DeviceInitializerStatus API review changesCraig Lafayette2015-05-062-10/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove DeviceInitializerStatus.is*Status() - Remove DeviceInitializerStatus.FLAG_STATUS_RESERVED - Rename STATUS_STATE_CONNECT_BLUETOOTH_PROXY to STATUS_STATE_CONNECTING_BLUETOOTH_PROXY - Rename STATUS_STATE_DISCONNECT_BLUETOOTH_PROXY to STATUS_STATE_DISCONNECTING_BLUETOOTH_PROXY Bug: 20819590 Change-Id: I276c5674a36726d3681dcc29e896ad39888d116d
* | | | Merge "Add feature for pro audio" into mnc-devGlenn Kasten2015-05-082-0/+2
|\ \ \ \
| * | | | Add feature for pro audioGlenn Kasten2015-05-082-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The specification for CDD is in progress Bug: 20877157 Change-Id: Iaf37b2ccb21562170a080b53668a41b85c410241
* | | | Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-devDianne Hackborn2015-05-082-79/+81
|\ \ \ \
| * | | | Fix issue #20655182: API Review: ViewAssistStructureDianne Hackborn2015-05-072-79/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the various view assist related APIs. Also remove the blockAssist view attribute, and instead use the window's FLAG_SECURE to drive blocking of the entire hierarchy (which is semantically correct, and will protect existing apps that have already indicated they need it). Change-Id: I6beebc86b202809cba0a356cae9607d8d0fb5e78
* | | | | Merge "Un-@hiding some missed VT APIs." into mnc-devTyler Gunn2015-05-082-0/+34
|\ \ \ \ \
| * | | | | Un-@hiding some missed VT APIs.Tyler Gunn2015-05-082-0/+34
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 20947116 Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
* | | | | Merge "DevicePolicyManager API review changes" into mnc-devCraig Lafayette2015-05-082-2/+2
|\ \ \ \ \
| * | | | | DevicePolicyManager API review changesCraig Lafayette2015-05-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed DO_NOT_ASK_CREDENTIALS_ON_BOOT to RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT. Bug: 20820907 Change-Id: I6455f9a6d370afbd5154505f402b409dba3b7918
* | | | | | Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-devAdam Powell2015-05-082-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add Build.VERSION.PREVIEW_SDK_INTAdam Powell2015-05-062-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a constant to the SDK that apps may use to detect incremental API changes across prerelease preview builds. APIs newer than the latest official API level are not guaranteed to be stable or even present across preview revisions. Change-Id: I14341e55a3ebc3d872977970b9440c400e71f588
* | | | | Replace "TEE" with "secure hardware".Alex Klyubin2015-05-082-4/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | This is to make the Android KeyStore API more generic. Bug: 18088752 Change-Id: I18bcc96db4af17127e5dc038becc9deb85bb48aa
* | | | Merge "Define String constants for AndroidKeyStore crypto." into mnc-devAlex Klyubin2015-05-072-0/+110
|\ \ \ \
| * | | | Define String constants for AndroidKeyStore crypto.Alex Klyubin2015-05-062-0/+110
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defines the String enum values based on JCA standard names for key algorithm, block mode, padding schemes, and digests. This should make it safer to interact with AndroidKeyStore code that uses JCA strings. This was requested by API Council. Bug: 18088752 Change-Id: I241d9225a13b85479d0a84e49d0a98cbc77e5817
* | | | Remove FloatMath methods from the APINeil Fuller2015-05-074-16/+30
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Also removing FloatMathTest. The tests are being moved into a legacy CTS suite. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
* | | Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-062-478/+0
| |/ |/| | | | | | | | | | | This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f. Bug: 20641986 Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
* | Add alternate intents and refinement callbacks to ChooserActivityAdam Powell2015-05-062-0/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a calling app to supply an array of additional Intents to the system ChooserActivity. The chooser will present a merged list of targets that can handle any of the Intents supplied, including both the standard EXTRA_INTENT as well as any of the intents supplied in EXTRA_ALTERNATE_INTENTS. These are treated as ordered; EXTRA_INTENT is considered the first/primary Intent and EXTRA_ALTERNATE_INTENTS are sorted most important first. Targets are queried for all supplied Intents. If the same component is returned for more than one Intent, the target is associated with the most important Intent that matched. This allows calling apps to supply several different payloads for an action depending on what the intended targets are able to support. For example, an app performing ACTION_SEND may supply image/jpeg data to compatible targets or a hosted web link to targets that only support text/plain. The user will have the opportunity to pick from a single merged list of choices using the best available payload, and will not be bothered with the implementation details of how the payload will be delivered to the recipient. If the calling app wishes to provide further disambiguation or refinement after the user makes a choice, for example to let the user choose which of the source intents to send from the primary or alternates, show a progress dialog as a full-resolution version of a photo is downloaded from the server before being sent along or while reticulating splines, the caller can supply an IntentSender to ACTION_CHOOSER including the extra EXTRA_REFINEMENT_INTENT_SENDER. This should be the IntentSender obtained from a PendingIntent pointing at an activity to launch to perform the refinement. The refinement activity should report that it is finished by obtaining the ResultReceiver from EXTRA_RESULT_RECEIVER. Available intents to send to the selected target will be contained in EXTRA_INTENT and EXTRA_ALTERNATE_INTENTS. To complete the refinement and send the result along to the chosen target, the refinement activity should select one of the supplied intents and send it to the ResultReceiver in a Bundle with the key EXTRA_INTENT and the result code RESULT_OK. To cancel the refinement, and let the user select another choice, send RESULT_CANCEL. While refinement activities cannot modify the filterEquals-affecting fields of the Intent they return, they may modify extras to provide additional or altered details to the final recipient. These extras will be filled into the Intent sent to the final target. Change-Id: I7ad4739eadd1a0e307675847ccf47ea948918a3a
* Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-devAlan Viverette2015-05-062-0/+2
|\
| * ListPopupWindow should use window layout type SUB_PANELAlan Viverette2015-04-302-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Look down, back up, where are you? You're in a dialog with an AutoCompleteTextView. What's on your screen? I have it, it's the auto-completion results you could be seeing. Look again. The window layout type is now TYPE_APPLICATION_SUB_PANEL and the auto-completion results are visible. Also adds API on ListPopupWindow to specify the window layout type and changes the text editing handle to be type ABOVE_SUB_PANEL. Bug: 18530738 Change-Id: Id5577c4892729920de5b73411e580e6b2b2401d0
* | Add scroll indicators on View, use in AlertDialogAlan Viverette2015-05-062-0/+22
| | | | | | | | | | | | | | | | | | Also updates default fade duration for scrollbars to match Material spec and moves around some padding in AlertDialog so that scrolling text and list items aren't so close to the title. Bug: 19098033 Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
* | Merge "Change sendSessionModifyRequest VideoProvider API signature." into ↵Tyler Gunn2015-05-062-2/+2
|\ \ | | | | | | | | | mnc-dev
| * | Change sendSessionModifyRequest VideoProvider API signature.Tyler Gunn2015-05-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including a fromProfile in addition to the requestedProfile. - Changed VideoCallImpl to generate the fromVideoProfile based on the call's current videoState. This ensures the InCall UI only needs to pass in the new video profile; the VideoCall Impl already has enough knowledge to generate the fromProfile. - Changed VideoCallImpl to track the current videoQuality, which forms a part of the fromVideoProfile. Bug: 20704229 Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
* | | Merge "Rename functions that disable status bar and keyguard" into mnc-devBenjamin Franz2015-05-062-4/+4
|\ \ \
| * | | Rename functions that disable status bar and keyguardBenjamin Franz2015-05-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the DevicePolicyManager functions setKeyguardEnabledState and setStatusBarEnabledState to setKeyguardDisabled and setStatusBarDisabled respectively. Bug: 20820039 Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
* | | | Merge "The voice assist may now be launched above the lockscreen" into mnc-devSelim Cinek2015-05-052-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | The voice assist may now be launched above the lockscreenSelim Cinek2015-05-052-0/+4
| |/ / | | | | | | | | | | | | | | | | | | A possibility was introduced to launch voice assist over the lockscreen using the left keyguard affordance. Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
* | | media: Added MPEG2 profile/levels and testsHarish Mahendrakar2015-05-052-0/+20
| | | | | | | | | | | | | | | Bug: 20852831 Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
* | | Merge "Add API for obtaining changing configurations bitmask from Theme" ↵Alan Viverette2015-05-052-0/+2
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Add API for obtaining changing configurations bitmask from ThemeAlan Viverette2015-05-052-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required to know when to reload the system context's theme in response to configuration changes, and thus needed to support the DayNight theme. Bug: 20267825 Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
* | | | Merge "Call Activity#onAttachFragment()" into mnc-devTodd Kennedy2015-05-052-0/+2
|\ \ \ \
| * | | | Call Activity#onAttachFragment()Todd Kennedy2015-05-042-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally removed during the changes to abstract a Fragment host. Also ensure Fragment#onInflate(Activity) gets invoked Bug: 20825263 Change-Id: I981266ae1e8817db5c82ec4609bbcf4a5e676fee
* | | | Merge "Permission UI - legacy apps support" into mnc-devSvet Ganov2015-05-051-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Permission UI - legacy apps supportSvet Ganov2015-05-051-0/+2
| | | | | | | | | | | | | | | | Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
* | | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-052-12/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge commit 'b6f59f4' into master_merge Merge commit 'f6db0ce' into master_merge Merge commit '17455a3' into master_merge Merge commit 'b4d5b32' into master_merge Merge commit 'a1a2fa7' into master_merge Merge commit '8dfdb98' into master_merge Merge commit 'eba66c3' into master_merge
| * \ \ \ Merge commit '17455a3' into master_mergePrerepa Viswanadham2015-05-012-8/+21
| |\ \ \ \
| | * | | | Add videoStateToString on videoProvider Class.Tyler Gunn2015-04-242-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Got tired of looking at numerical integer videoStates, so added a new "videoStateToString" static method, similar to how we have a Connection#capabilitiesToString method. Bug: 20257400 Change-Id: I39fcf413938c90e5993985f0976ad4fcce11505d
| | * | | | Update the SmsMessage.createFromPdu() API callCheuksan Wang2015-04-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the old createFromPdu(byte[] pdu) call because it just guesses the format of the PDU. Instead, unhide the createFromPdu(byte[] pdu, String format) call which specifies the PDU format. BUG: 20015718 Change-Id: I133fc17bf5af4f762fea3106e75beea58185fd5d
| | * | | | No Permission check for WiFi RTTxinhe2015-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:19918231 Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
| | * | | | add a parameter to carrier messaging calls to request delivery statusCheuksan Wang2015-04-242-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the carrier messaging API, I forgot to add the parameter to request delivery status. We need to add one more parameter (to indicate requesting delivery status) to these calls: onSendMultipartTextSms onSendTextSms onSendDataSms Backward compatibility is maintained in CarrierMessagingService.java. Third-party carrier apps implementing the old API will continue to work. BUG: 20224743 Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932