summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Bring back screenshot API." into mnc-devDianne Hackborn2015-06-172-0/+4
|\
| * Bring back screenshot API.Dianne Hackborn2015-06-162-0/+4
| | | | | | | | Change-Id: Ia6bdfa300398d39119239f6a88c9992673edb3e0
* | Merge "Add carrier config variable to hide sim lock setting ui." into mnc-devJunda Liu2015-06-172-0/+2
|\ \
| * | Add carrier config variable to hide sim lock setting ui.Junda Liu2015-06-172-0/+2
| | | | | | | | | | | | | | | Bug: b/19623656 Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
* | | Merge "Remove hide_carrier_network_settings from Settings." into mnc-devJunda Liu2015-06-162-2/+0
|\ \ \
| * | | Remove hide_carrier_network_settings from Settings.Junda Liu2015-06-152-2/+0
| |/ / | | | | | | | | | | | | | | | | | | No longer needs this as carrier config manager handles it now. Bug: b/21347654 Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
* | | Merge "Allow 3P apps to provide structured data within AssistContent." into ↵Chirag Shah2015-06-162-0/+4
|\ \ \ | |_|/ |/| | | | | mnc-dev
| * | Allow 3P apps to provide structured data within AssistContent.Chirag Shah2015-06-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For providing structured metadata to the assistant, we've decided to standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the data to be specified via: AssistContent.setStructuredData(String structuredDataJson) This method can be documented for 3P developers as allowing developers to provide metadata to the assistant with the JSON-LD standard. This would be centered more about content displayed on the screen, rather than actions based, so we added it to the AssistContent class Updated doc: go/setStructuredData Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
* | | Yet another user restriction.Jeff Sharkey2015-06-152-0/+2
| | | | | | | | | | | | Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
* | | Merge "Add metadata for pre-distortion dimensions." into mnc-devRuben Brunk2015-06-162-0/+2
|\ \ \
| * | | Add metadata for pre-distortion dimensions.Ruben Brunk2015-06-152-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 20491394 Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
* | | | Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." ↵Junda Liu2015-06-152-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.Junda Liu2015-06-152-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | Bug: b/21499566 Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
* | | | Merge "Send broadcast when default dialer changes" into mnc-devYorke Lee2015-06-152-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Send broadcast when default dialer changesYorke Lee2015-06-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hidden TelecomManager.setDefaultDialer for system apps to set the default dialer and trigger the broadcast Bug: 21846308 Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
* | | | Fix issue #21813831: Need API for asking to be added to power whitelistDianne Hackborn2015-06-152-0/+2
| |_|/ |/| | | | | | | | | | | | | | Add the API. Clean up a few related things. Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
* | | Remove EcIesParameterSpec until it's needed.Alex Klyubin2015-06-152-48/+0
|/ / | | | | | | | | | | | | | | | | This class was added in Android M to enable us to expose ECIES. ECIES is not going to happen in Android M. I'm thus removing this unused class until such time when it's needed. Bug: 18088752 Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32
* | Merge "Remove bookmarks provider and associated permissions - framework" ↵Svetoslav2015-06-144-98/+104
|\ \ | | | | | | | | | into mnc-dev
| * | Remove bookmarks provider and associated permissions - frameworkSvetoslav2015-06-114-98/+104
| | | | | | | | | | | | Change-Id: I7f5a2f14a12da473f05a5075d98e762f8f8ed970
* | | Make AppOpsManager#permissionToOp API publicSvet Ganov2015-06-142-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this API to implement permission checker API in the support lib that takes into account both app ops and permissions. bug:21277214 Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
* | | Merge "Fix APIs." into mnc-devDianne Hackborn2015-06-122-4/+6
|\ \ \
| * | | Fix APIs.Dianne Hackborn2015-06-112-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode() Issue #21347000: API Review: android.content.IntentFilter Issue #20654534: API Review: android.app.assist Also allow use of ActivityManager.setWatchHeapLimit on any platform build as long as the calling app is debuggable. Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
* | | | Change references to APK Certificate to SignatureRubin Xu2015-06-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that currently apk signature is certificates is just implementation details. Bug: 20820366 Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
* | | | Merge "Add new storage permission group" into mnc-devSvet Ganov2015-06-122-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add new storage permission groupSvet Ganov2015-06-112-0/+2
| |/ / | | | | | | | | | | | | | | | bug:21730509 Change-Id: If098def755417a90f50328f83d5b419d9e73f120
* | | Merge "Add ArraySet to the SDK." into mnc-devDianne Hackborn2015-06-112-2/+52
|\ \ \
| * | | Add ArraySet to the SDK.Dianne Hackborn2015-06-112-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | Also fix some documentation. Change-Id: I46025c3b5450e7cd671135b99ff3b298e223651d
* | | | Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-devAdam Lesinski2015-06-112-2/+2
|\ \ \ \
| * | | | UsageStats: Change INTERACTION to SYSTEM_INTERACTIONAdam Lesinski2015-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SYSTEM_INTERACTION events are signals to the system for a package's implicit actions (service bound, etc). These should not affect the API visible stats like lastTimeUsed, etc. USER_INTERACTION is for user initiated actions (notification interaction, etc). Bug:21761781 Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
* | | | | Revert "Revert "Permissions: Fix account related permissions.""Carlos Valdivia2015-06-114-24/+0
| |/ / / |/| | | | | | | | | | | | | | | | | | | This reverts commit dcddc476651deb72a27798de56eef584e5be5d32. Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe
* | | | Revert "Permissions: Fix account related permissions."Carlos Valdivia2015-06-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814. Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
* | | | Permissions: Fix account related permissions.Carlos Valdivia2015-06-112-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires updating the docs in AccountManaager as well as the logic in AccountManagerService. MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going away. Where AUTHENTCATE_ACCOUNTS was required we now do signature matching. GET_ACCOUNTS is kept but has been grouped under contacts. Bug: 20136477 Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
* | | | Merge "Remove device initializer status messages" into mnc-devCraig Lafayette2015-06-112-47/+0
|\ \ \ \
| * | | | Remove device initializer status messagesCraig Lafayette2015-06-022-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove ManagedProvision Bluetooth extras from DevicePolicyManager - Remove ManagedProvisioning device initializer status action and extras from DevicePolicyManager. - Remove DIA status update protected-broadcast and permission - Remove DPM.sendDeviceInitializerStatus method Bug: 21559093 Change-Id: Ibb651ebb2772ace6a16a5830f82f75465150e6e3
* | | | | Propagete document meta-data to custom print UI.Svet Ganov2015-06-112-0/+2
| |_|/ / |/| | | | | | | | | | | Change-Id: I3f122224e1b311a222969253ae0336177989a414
* | | | Merge "API council review feedback for ActionMenuView" into mnc-devChris Banes2015-06-112-28/+20
|\ \ \ \
| * | | | API council review feedback for ActionMenuViewChris Banes2015-06-102-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts "MenuItem, navigation and overflow icon tinting" CL, and adds getter and setter for the overflow icon to ActionMenuView and Toolbar. BUG: 21571899 Change-Id: I591f43650356443fa3256e4d74e28b6ddd8c2b33
* | | | | Merge "Add system API to watch for permission changes" into mnc-devSvetoslav2015-06-111-0/+8
|\ \ \ \ \
| * | | | | Add system API to watch for permission changesSvetoslav2015-06-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
* | | | | | Fix MediaBrowser.getItem() API inconsistencies, again.Jeff Brown2015-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21668207 Change-Id: I2439179e5e551b5628a1d2044f43a9df74d4240c
* | | | | | Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> ↵Jonathan Basseri2015-06-112-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev
| * | | | | | Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOLJonathan Basseri2015-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling voice privacy sounds scary. Update this config variable name to what it actually does, which is to hide some settings UI. Bug: 21571894 Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
* | | | | | | Merge "TIF: Support localized input label for hardware input" into mnc-devDongwon Kang2015-06-111-0/+2
|\ \ \ \ \ \ \
| * | | | | | | TIF: Support localized input label for hardware inputDongwon Kang2015-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20803624 Change-Id: Iade3b2a11a6d946e2d1b1e5c12f2cad60abdcf6d
* | | | | | | | Merge "Fix MediaBrowser.getItem() API inconsistencies." into mnc-devJeff Brown2015-06-112-16/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix MediaBrowser.getItem() API inconsistencies.Jeff Brown2015-06-102-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21668207 Change-Id: Idc8d3a079f66cc7bc4fa1016f84cddb26fe7f0f8
* | | | | | | | Merge "Expose Context.getSystemServiceName()." into mnc-devJeff Brown2015-06-112-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Expose Context.getSystemServiceName().Jeff Brown2015-06-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose this method so that subclasses can declare new types of services that can be returned by getSystemService(Class<T>). Bug: 21343770 Change-Id: I08bdfa61153d19298645dc495deb2d535e54f9f0
* | | | | | | Merge "Update fingerprint icon" into mnc-devJorim Jaggi2015-06-102-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update fingerprint iconJorim Jaggi2015-06-102-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, a flat, scalable, tintable vector icon is used instead of a complex graphics. This makes it suitable for most use cases. Also rename it to fingerprintAuthDrawable. Bug: 21572289 Change-Id: I413acbbd8e5143ddcb3e2cfa9772949d5fbf02fc