10890 Commits

Author SHA1 Message Date
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Yorke Lee
03123839e4 Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 2015-06-09 20:09:57 +00:00
Yorke Lee
02fb5bc52b Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS
Bug: 19696065
Change-Id: Ibe253c8cd66938ea1cd560d443008026eb1005d9
2015-06-09 12:28:06 -07:00
Paul Miller
c8694a082a Deprecate WebView scrollbar overlay API
Deprecate setHorizontalScrollbarOverlay, setVerticalScrollbarOverlay,
overlayHorizontalScrollbar, and overlayVerticalScrollbar. They've been
no-ops for years, ever since WebViewChromium.

BUG:21642246
Change-Id: Ia1062c53fdbaa7a0d282ba79da733a6f3b9ac84f
2015-06-09 11:48:01 -07:00
Eino-Ville Talvala
7b7e1f97aa Merge "ExifInterface: Add a few tag fields." into mnc-dev 2015-06-09 18:29:08 +00:00
Andreas Gampe
2c936af815 Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 2015-06-09 18:20:00 +00:00
Richard Uhler
659716d7a0 Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 2015-06-09 16:40:57 +00:00
Julia Reynolds
cedd53adc3 Remove the ability to set a preferred setup activity.
Bug: 21557327
Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
2015-06-09 12:34:27 -04:00
Andreas Gampe
ee0cdce2a8 Frameworks/base: Add is64Bit method to Process
Add a public method to Process to query whether the current runtime
is running in 64-bit mode.

Bug: 21069469
Change-Id: Ifaf4251f05bbe5eba135fa977190e475632856bd
2015-06-09 09:22:55 -07:00
Erik Kline
d895999858 Make public Network#bindSocket(FileDescriptor).
Code that uses android.system.Os to create sockets as FileDescriptors
should be able to bind them to networks.  Note that FileDescriptors
could already be marked as "protected from VPNs" via
NetworkUtils#protectFromVpn(), but heretofore were not easily bound
to any particular network.

Bug: 21449922
Change-Id: I4bb86db5d95d5a55bb2d7e245848d11eaa351e65
2015-06-09 16:19:24 +09:00
Jim Miller
800ebfc166 Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 2015-06-09 01:46:22 +00:00
Alex Klyubin
12742ab5f4 Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 2015-06-09 00:51:28 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
2015-06-08 16:36:29 -07:00
Eino-Ville Talvala
ab60e7e6e0 ExifInterface: Add a few tag fields.
Since these are being CTS tested, they should be public.

Bug: 21568414
Change-Id: I3f9f6e5da240b2ac0b2b88b5d25ec3c8c4704b8d
2015-06-08 15:28:09 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
2015-06-08 14:59:09 -07:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
2015-06-08 13:49:13 -07:00
Alex Klyubin
469cbf5156 Deprecate KeyChain.isBoundKeyAlgorithm.
This is bad API. There was never a guarantee that when this method
returns true for a key algorithm (e.g., RSA or EC), then all keys of
that type will be imported into secure hardware. For example, the
secure hardware may reject a key if it's of unsupported size or uses
an unsupported public exponent or EC curve. In that case, the key
will be imported into keystore/KeyChain without being backed by secure
hardware.

Bug: 18088752
Change-Id: I8daa574a2e703a347d09d93401cd1ea2d0162ed9
2015-06-08 13:22:53 -07:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
2015-06-08 19:59:29 +00:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Tim Kilbourn
72285e5600 API review: Update hasMic to hasMicrophone.
Also make the SearchEvent constructor available for testing.

Bug: 21572283
Bug: 21572676
Change-Id: I35cfd88b45aeb97b6ccf83aeb46b0ecc4bbc0947
2015-06-08 16:52:36 +00:00
Tim Kilbourn
159f558a39 Merge "Pass an args bundle to launchAssistAction." into mnc-dev 2015-06-08 16:46:42 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
George Mount
616bb3d50c Merge "API Council changes." into mnc-dev 2015-06-08 16:36:22 +00:00
Yorke Lee
678cd9f37c Merge "Add telecom extra to specify handle for incoming call" into mnc-dev 2015-06-08 16:32:14 +00:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access.
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
2015-06-08 11:53:35 -04:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Mady Mellor
a54a8626ed Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 2015-06-08 15:11:10 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Wale Ogunwale
26698514fb Use DisplayAdjustments when creating display in ResourceManager
We were previous only taking the Configuration into account when
creating Display objects in the ResourceManager. This led to the
Display object not containing critical CompatibilityInfo. We now
take the entire DisplayAdjustment into account.

Bug: 21637615
Change-Id: Ide5ff49bfa12791ad17993764f312836216b1dd8
2015-06-06 11:26:33 -07:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
2015-06-05 18:55:29 -06:00
James Cook
6cf397508e Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
2015-06-05 16:36:22 -07:00
Tim Kilbourn
0e5f110fc9 Pass an args bundle to launchAssistAction.
In order to track the input device that was used to trigger assist, the
input device id is sent as an extra in the assist intent whenever it is
available. This is particularly useful on TVs, when an app may want to
know whether the input device has a microphone.

Bug: 21666123
Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
2015-06-05 23:26:39 +00:00
Yorke Lee
04ea7d3b7c Add telecom extra to specify handle for incoming call
Bug: 19696065
Change-Id: Ie7c9e3f982808abd4944cfa7bd3c754b93479f84
2015-06-05 16:00:12 -07:00
ztenghui
5dfe9d30b4 Merge "Add reset to AVD" into mnc-dev 2015-06-05 22:47:30 +00:00
ztenghui
9605271806 Add reset to AVD
b/21664621

Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a
2015-06-05 15:42:59 -07:00
Jonathan Basseri
69822f0d63 Renaming carrier config variable keys.
API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
2015-06-05 15:08:55 -07:00
Mady Mellor
015020eb3a Change stylus button press to context click in GD - API review feedback
Based on API review feedback we should use onContextClick instead of
onStylusButtonPress. This CL updates associated methods and usage
in GestureDetector.

Additionally listens for mouse right clicks and calls the
onContextClick method for these as well.

Bug: 21572278
Change-Id: I4fa01997bff7265d5d2713353a93e07417a148e5
2015-06-05 14:41:22 -07:00
George Mount
aef1ae3391 API Council changes.
Bug 21571897

Change-Id: I681096c50a6f4a448e399b482742efc06229fab1
2015-06-05 14:23:47 -07:00
Dianne Hackborn
67ba2c7fa2 Fix issue #21572679: API Review: ActivityOptions, usage time report
Change-Id: I62751e93e39f90d5d2ec725586880724f3edbbc7
2015-06-05 14:23:38 -07:00
Amit Mahajan
48cf298cb8 Merge "Change to hide BEARER_BITMASK." into mnc-dev 2015-06-05 18:24:05 +00:00
ztenghui
e1352de673 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:10 +00:00
Mady Mellor
e860891b1a Change stylus button press to context click in View - API review feedback
Updates all references in View's onStylusButtonPress to onContextClick
as per API review feedback.

Additionally listens for mouse right clicks and calls the onContextClick
method for these as well for the stylus button press.

Bug: 21572278
Change-Id: I5c1ee8c8f23a77d7c677b86356e89d0e4fc40056
2015-06-05 09:02:55 -07:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
2015-06-05 14:41:51 +00:00