10726 Commits

Author SHA1 Message Date
Santos Cordon
d9e1fe3cd4 Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev 2015-05-14 02:07:58 +00:00
Yorke Lee
ad0bfe3ae2 Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev 2015-05-14 02:06:54 +00:00
Svetoslav
857c3019ba Merge "Do not allow opting out from the new permission model." into mnc-dev 2015-05-14 02:04:30 +00:00
Svetoslav
d965370398 Do not allow opting out from the new permission model.
bug:20525775

Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
2015-05-13 18:54:57 -07:00
Mikhail Naganov
822f1aaf2b Merge "Update the new error reporting API in android.webkit" into mnc-dev 2015-05-14 01:43:48 +00:00
Mikhail Naganov
8d4f07f8d3 Update the new error reporting API in android.webkit
- minor changes in WebResourceError;
 - prepare to remove WebResourceResponseBase;
 - add immutable mode to WebResourceResponse.

Bug: 21063767

Change-Id: Iaf5f92e3850732c7a888453468e108809b3b782a
2015-05-13 18:40:20 -07:00
Andy Hung
bece0c7a1d Add getChannelIndexMasks API to AudioDeviceInfo
Fix some javadoc as well.

Bug: 21129531
Change-Id: I82e5b66f254f6acdcd93638eeed878b4c5b5be34
2015-05-13 18:33:28 -07:00
Yorke Lee
e01f93557d Merge "Rename AudioState to CallAudioState" into mnc-dev 2015-05-14 01:21:16 +00:00
Dianne Hackborn
4be8c4cc4c Fix build.
Change-Id: I94c7e3033721c1d8024a212614752512e685289b
2015-05-13 17:35:42 -07:00
Santos Cordon
cad84a2070 [1/4] Use new Icon class in PhoneAccount.
Bug: 21088522
Change-Id: Ia03171d4861f758701e89733f4082863587e8c11
2015-05-13 16:57:48 -07:00
Svet Ganov
67b7ec2887 Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev 2015-05-13 23:45:23 +00:00
Robert Shih
55e6ad78a0 Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev 2015-05-13 23:36:51 +00:00
Ihab Awad
24145d451b Merge "Refactor StatusHints (1/3)" into mnc-dev 2015-05-13 23:26:05 +00:00
Robert Shih
b7514effd1 MediaPlayer/TimedMetaData: API updates related to timed metadata
- renamed MediaPlayer.*OnTimedMetaData* to *OnTimedMetaDataAvailable*
- added `final` modifier to TimedMetaData class
- added javadocs for TimedMetaData public methods
- renamed private members and cooresponding accessors for TimedMetaData
- reworded existing TimedMetaData javadoc

Bug: 21045118
Change-Id: If0113307fce08083226fc7f64c4fe6f93553d899
2015-05-13 16:19:51 -07:00
Ihab Awad
a7684ed638 Refactor StatusHints (1/3)
Refactor StatusHints to use the new Icon class.

Bug: 21040387
Change-Id: I3e7aae38127294b46859efb6a2aec71cf90e0e2a
2015-05-13 16:16:11 -07:00
Yorke Lee
249c12e7b8 Add BIND_TELECOM_CONNECTION_SERVICE permission
Bug: 21088342
Change-Id: I465307899d83c4a3ee5e88a28554c4b867c1f4ba
2015-05-13 16:12:44 -07:00
Chien-Yu Chen
8062d31d27 Camera2: Fix reprocessing API naming and docs
Rename reprocessible to reprocessable and OPAQUE reprocessing to
PRIVATE reprocessing. Also fix a few broken links in reprocessing
APIs.

Bug: 21044522
Change-Id: I155b62d8743b036bd4b46f0da87749ce4e20b467
2015-05-13 16:02:46 -07:00
Lajos Molnar
907d8afd6b Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev 2015-05-13 23:01:28 +00:00
Paul McLean
338f27ab28 New policy for internal and wired device names.
For internal and unknowable wired devices, return the product name (i.e. "Nexus 7").
For connected devices with manufacturer-supplied product names, return those.
Change getName() to getProductName().

Bug: 20880296
Change-Id: I67ef3d4c73b3acab368b0879faa26fa9127c21bb
2015-05-13 15:41:00 -07:00
Svet Ganov
f7e9cf4fb4 Access mock location is no longer a runtime permission - framework
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.

bug:21078873

Change-Id: I19e3f9dc7c7de82eab46b30fec1abfbca54a0e59
2015-05-13 15:37:21 -07:00
Selim Gurun
af9d60af0d Merge "Address API feedback for PostMessage" into mnc-dev 2015-05-13 22:37:02 +00:00
Junda Liu
4d0f2afdc4 Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev 2015-05-13 22:13:24 +00:00
Junda Liu
6c217a25a4 Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Bug: b/21028396
Change-Id: I4905a1d1db247955ae7fa00a7f5ddfd7337ba5a8
2015-05-13 15:11:10 -07:00
Yorke Lee
4af5935c71 Rename AudioState to CallAudioState
Deprecate AudioState class and make methods @SystemApi where
necessary to minimize impact to SystemApi
Replace usages of AudioState inside Telecom sub-systems
Fire both onCallAudioStateChanged and onAudioStateChanged callbacks
for backward compatibility
Support both setAudioState and setCallAudioState for all classes

Bug: 21040387
Bug: 21088300
Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7
2015-05-13 14:58:15 -07:00
Jae Seo
ae649b1af8 Merge "TIF: API Review: android.media.tv" into mnc-dev 2015-05-13 21:44:01 +00:00
Lajos Molnar
6b7ef3725e media: rename MediaCodec.setSurface to setOutputSurface
Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
2015-05-13 14:43:33 -07:00
Alex Klyubin
87cca291bd Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev 2015-05-13 21:36:17 +00:00
Selim Gurun
0a814b61e3 Address API feedback for PostMessage
Bug: 21043955

Add anchor tags, and hide the constructor for WebMessagePort.

Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552
2015-05-13 14:14:14 -07:00
Julia Reynolds
396d944001 Merge "Remove initiator name param." into mnc-dev 2015-05-13 20:14:44 +00:00
Jeff Sharkey
2817f22d15 Merge "Hide API not ready for prime time." into mnc-dev 2015-05-13 20:08:13 +00:00
Jeff Sharkey
f85ac77f0c Hide API not ready for prime time.
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
2015-05-13 13:07:29 -07:00
Chong Zhang
80283cd747 Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev 2015-05-13 19:57:12 +00:00
Alex Klyubin
3f8d4d8408 New AndroidKeyStore API in android.security.keystore.
This CL addresses the comments from API Council about Android KeyStore
KeyPairGeneratorSpec, KeyGeneratorSpec and KeyStoreParameter:
1. These abstractions should not take or hold references to Context.
2. The Builders of these abstractions should take all mandatory
   parameters in their constructors rather than expose them as
   setters -- only optional paratemers should be exposed via setters.

These comments cannot be addressed without deprecation in the already
launched KeyPairGeneratorSpec and KeyStoreParameter. Instead of
deprecating just the getContext methods and Builder constructors, this
CL goes for the nuclear option of deprecating KeyPairGeneratorSpec and
KeyStoreParameter as a whole and exposing all of the AndroidKeyStore
API in the new package android.security.keystore. This enables this CL
to correct all of the accrued design issues with KeyPairGeneratorSpec
(e.g., naming of certificate-related methods) and KeyStoreParameter.

This also makes the transition to API Level M more clear for existing
users of the AndroidKeyStore API. These users will only have to deal
with the new always-mandatory parameters (e.g., purposes) and
sometimes-mandatory (e.g., digests, block modes, paddings) if they
switch to the new API. Prior to this CL they would've had to deal with
this if they invoked any of the new methods of KeyPairGeneratorSpec
or KeyStoreParameter introduced in API Level M.

This CL rips out all the new API introduced into KeyPairGeneratorSpec
and KeyStoreParameter classes for Android M, thus reverting these
classes to the API launched in L MR1. This is because the new API is
now in android.security.keystore.KeyGenParameterSpec and KeyProtection
respectively.

Bug: 21039983
Change-Id: I59672b3c6ef7bc25c40aa85f1c47d9d8a05d627c
2015-05-13 12:49:58 -07:00
Chong Zhang
9560ddb48a MediaCodec: rename usePersistentInputSurface to setInputSurface
bug: 21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
2015-05-13 10:53:47 -07:00
Jonathan Basseri
4f9ad1678e Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
2015-05-13 10:45:29 -07:00
Dan Sandler
b27333bcca Merge "Icon API tuneups:" into mnc-dev 2015-05-13 17:32:17 +00:00
Dan Sandler
877d696c38 Icon API tuneups:
- Reorder parameters to loadDrawableAsync()
- New version of createWithResource that takes a package
  name instead of a Resources
- Add loadDrawableAsUser() for INTERACT_ACROSS_USERS clients
  like SystemUI
- Docs cleanups

Bug: 21089268
Bug: 21031774
Change-Id: I465d2b865e35e12094b564f994e59d55e522f65a
2015-05-13 13:15:46 -04:00
Zoltan Szatmary-Ban
381483b3a0 Rename NetworkUsageStats -> NetworkStats
Also making other changes to Data Usage API as requested by API review.

Bug: 20823478
Change-Id: Id766c5a725c856da9d8883d73ae788fc1472440a
2015-05-13 17:53:17 +01:00
Paul McLean
7b0e380bf0 Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev 2015-05-13 16:19:00 +00:00
Tobias Sargeant
1bff3246bf Update API.
Bug: 21043955
Change-Id: Ibc012c1e60336f1f070982d27b8c75be8590dc5a
2015-05-13 16:12:26 +01:00
Paul McLean
033468868d API Council Change Phase 2 - add/remove callback
Change-Id: Ic7d374c67ef46a2bc8427fa3555e3ad1a4b0723e
2015-05-13 08:01:19 -07:00
Jae Seo
3d04b76934 TIF: API Review: android.media.tv
Addressed the feedback from the API Review:

android.media.tv.TvView.TimeShiftPositionCallback
Please add more documentation to explain why we are using the wall-clock
time here.

android.media.tv.TvInputService
onTimeShiftSetPlaybackRate should be renamed to
onTimeShiftSetPlaybackParams and pass in the PlaybackParams object
(formerly known as PlaybackSettings) instead of the rate and mode
separately.

android.media.tv.TvTrackInfo
getDescription() should return a CharSequence not a String.

android.media.tv.TvTrackInfo.Builder
setDescription() should take a CharSequence as input.

android.media.tv.TvView
Change timeShiftSetPlaybackRate() to setTimeShiftPlaybackParams() and
use the PlaybackParams object (formerly known as PlaybackSettings)
instead of the rate and mode separately.

Bug: 21045120
Change-Id: I768665ae9c385fcb034bfb346c21b4c9f0891172
2015-05-12 20:14:37 -07:00
Fabrice Di Meglio
a5c24e3bfe Merge "Add IntentFilter auto verification - part 9" into mnc-dev 2015-05-13 01:53:08 +00:00
Yorke Lee
642737c8ae Merge "More video related API fixes" into mnc-dev 2015-05-13 01:33:15 +00:00
Selim Gurun
94fa03876e Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev 2015-05-13 01:23:52 +00:00
Selim Gurun
0b408586c6 Add a temporary wrapper for ViewStructure until Webview APK is updated
It turned out that after the API change from ViewAssistStructure to
ViewStructure, the suggested mechanism did not work, and webview
started throwing abstractmethoderror exceptions. Temporarily
solve the problem by wrapping ViewStructure inside a
ViewAssistStructure. Once Webview APK is updated, drop it.

Change-Id: I09dfe7dac9c2bc7c037d842844c61dd879629470
2015-05-12 18:06:59 -07:00
Alan Viverette
5401b4cd60 Merge "Update APIs to fix build" into mnc-dev 2015-05-13 00:29:09 +00:00
Alan Viverette
343639b659 Update APIs to fix build
Change-Id: I79e15ed436efe9f7223bc54e3737457885fdc571
2015-05-12 17:26:47 -07:00
Svet Ganov
221ffb2662 Merge "Runtime permissions for system components not revokable - framework" into mnc-dev 2015-05-13 00:17:46 +00:00
Fabrice Di Meglio
ef741da4d4 Add IntentFilter auto verification - part 9
- make verifyIntentFilter(int, int, List<String>) a SystemApi

See bug #19628271

Change-Id: I8b1f29da385867beb8b19829c124db1821450c41
2015-05-12 16:58:30 -07:00