summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-devJohn Spurlock2015-05-0812-253/+361
|\
| * Zen: Simplify notification policy api, add zenmode api.John Spurlock2015-05-0812-253/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 "BluetoothMidiDevice: Cleanup and error handling improvements" into ↵Mike Lockwood2015-05-081-15/+19
|\ \ | | | | | | | | | mnc-dev
| * | BluetoothMidiDevice: Cleanup and error handling improvementsMike Lockwood2015-05-071-15/+19
| | | | | | | | | | | | Change-Id: I8b932f73e0230adfe576d1fc6735bd7b41e84010
* | | Merge "DeviceInitializerStatus API review changes" into mnc-devCraig Lafayette2015-05-084-49/+11
|\ \ \
| * | | DeviceInitializerStatus API review changesCraig Lafayette2015-05-064-49/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 "More Javadocs for AndroidKeyStore public classes." into mnc-devAlex Klyubin2015-05-084-58/+251
|\ \ \ \
| * | | | More Javadocs for AndroidKeyStore public classes.Alex Klyubin2015-05-084-58/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds more detailed class-level Javadocs (incl. examples) for the following public API of Android KeyStore facility: * KeyPairGeneratorSpec, * KeyGeneratorSpec, * KeyStoreParameter, * KeyStoreKeySpec. This also clarifies what encryption at rest means. Bug: 18088752 Change-Id: I9951a528c34dea322534763b596902a2b6ac64f9
* | | | | Merge "Cleanup keystore password changing and unlocking" into mnc-devChad Brubaker2015-05-086-82/+133
|\ \ \ \ \
| * | | | | Cleanup keystore password changing and unlockingChad Brubaker2015-05-086-82/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add KeyStore.onUserPasswordChanged for the lockscreen to call when the user changes their password. Keystore will then handle the logic of deleting keys. Instead of calling Keystore.password_uid for both unlocking and password changes the behavior has been split into Keystore.unlock and onUserPasswordChanged. Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
* | | | | | Merge "Fix: Hard to modify multi-line selection." into mnc-devMady Mellor2015-05-081-10/+14
|\ \ \ \ \ \
| * | | | | | Fix: Hard to modify multi-line selection.Keisuke Kuroyanagi2015-05-071-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mTouchWordOffset was not appropriately updated when a selection is modified across multiple lines. Bug: 20650838 Change-Id: I46f5393970dc8d806719467bac489feac0fbe1a5
* | | | | | | Merge "Switch libjnigraphics.so to hash-style=both" into mnc-devDmitriy Ivanov2015-05-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Switch libjnigraphics.so to hash-style=bothDmitriy Ivanov2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/19059885 Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc (cherry picked from commit 2e84bc6948bb24ec67bf289ee1d0ed937a0fd4ff)
* | | | | | | | Merge "Fix kSkippedFrame setting" into mnc-devJohn Reck2015-05-081-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix kSkippedFrame settingJohn Reck2015-05-081-2/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only set previously if RenderThread dropped the frame, but not if the UI thread frame was dropped. Unify the two paths Change-Id: If2574edde3cb0949deed4e47f3daaddb890a1b28
* | | | | | | Merge "AudioManager: add previous AudioPort list" into mnc-devEric Laurent2015-05-082-11/+53
|\ \ \ \ \ \ \
| * | | | | | | AudioManager: add previous AudioPort listEric Laurent2015-05-082-11/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain a cache of previously attached audio ports used to create lists of added and removed devices following a port list update callback. Change-Id: Iad1c95b85c8ae9bdbed79eb0cdc46aeedeafccea
* | | | | | | | Merge "Compatibility hack" into mnc-devJohn Reck2015-05-081-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Compatibility hackJohn Reck2015-05-081-0/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20940526 Rather than throwing an exception on accessing a recycled() bitmap let certain operations succeed and just return dummy values. Apps appear to be relying on this. Change-Id: I74df2efdc29d93facd8553ed31cda3addf0b28eb
* | | | | | | | Merge "Add 'App Summary' section to meminfo." into mnc-devRichard Uhler2015-05-085-139/+360
|\ \ \ \ \ \ \ \
| * | | | | | | | Add 'App Summary' section to meminfo.Richard Uhler2015-05-085-139/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'App Summary' section is shown by default when other memory details are shown. This adds a new meminfo flag '-s' to show only the App Summary section. Change-Id: I66913673cd3afca873a8b13e45abe071d4c57b82
* | | | | | | | | Merge "Add feature for pro audio" into mnc-devGlenn Kasten2015-05-083-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add feature for pro audioGlenn Kasten2015-05-083-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specification for CDD is in progress Bug: 20877157 Change-Id: Iaf37b2ccb21562170a080b53668a41b85c410241
* | | | | | | | | | Merge "Allow ContextImpl.setTheme(int) to be called after getTheme()" into ↵Alan Viverette2015-05-082-9/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | Allow ContextImpl.setTheme(int) to be called after getTheme()Alan Viverette2015-05-012-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the theme could only be set if it had never been obtained, which was inconsistent with the documentation for Context.setTheme() and the behavior of ContextThemeWrapper. Also prevents double-apply of themes in setTheme(). Bug: 20756250 Bug: 20230451 Change-Id: I2566b3e4546cd1c68db79f10f01a5a1256fd439c
* | | | | | | | | | | Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-devDianne Hackborn2015-05-0816-202/+236
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue #20655182: API Review: ViewAssistStructureDianne Hackborn2015-05-0716-202/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Don't call updateDisplayListIfDirty outside draw." into mnc-devGeorge Mount2015-05-081-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't call updateDisplayListIfDirty outside draw.George Mount2015-05-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20909826 Change-Id: If332319ba192606cc30fc8d0de00086fc5135deb
* | | | | | | | | | | | | Merge "Un-@hiding some missed VT APIs." into mnc-devTyler Gunn2015-05-086-18/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Un-@hiding some missed VT APIs.Tyler Gunn2015-05-086-18/+34
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20947116 Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
* | | | | | | | | | | | | Merge "DevicePolicyManager API review changes" into mnc-devCraig Lafayette2015-05-084-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | DevicePolicyManager API review changesCraig Lafayette2015-05-074-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed DO_NOT_ASK_CREDENTIALS_ON_BOOT to RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT. Bug: 20820907 Change-Id: I6455f9a6d370afbd5154505f402b409dba3b7918
* | | | | | | | | | | | | Merge "Use correct array index for Theme.getTheme()" into mnc-devAlan Viverette2015-05-081-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use correct array index for Theme.getTheme()Alan Viverette2015-05-081-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic462a7b8a81bb87bf08136bb30e3432f10269918
* | | | | | | | | | | | | | Merge "Add eglSwapBuffersWithDamageKHR support" into mnc-devJohn Reck2015-05-086-32/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add eglSwapBuffersWithDamageKHR supportJohn Reck2015-05-086-32/+76
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 20761426 Disabled temporarily Change-Id: I0b6b6f0eebab886145e13fa35aefe76826965cf5
* | | | | | | | | | | | | | Merge "Switch to KeyguardManager.isDeviceSecure." into mnc-devAlex Klyubin2015-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Switch to KeyguardManager.isDeviceSecure.Alex Klyubin2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isKeyguardSecure also returns true when SIM PIN is required. We don't care about that because entering SIM PIN does not unlock keys requiring user authentication. isDeviceSecure returns true only if secure lock screen is set up, which is exactly what we want. Bug: 18088752 Change-Id: I47b21f3351f55c11e8e9bcfd7654762973dd9271
* | | | | | | | | | | | | | | Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-devAdam Powell2015-05-083-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add Build.VERSION.PREVIEW_SDK_INTAdam Powell2015-05-063-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | am 4e19b9a0: am 27e82e7b: Merge "Doc change: remove design content that has ↵Dirk Dougherty2015-05-0832-4319/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved to material spec." into mnc-preview-docs * commit '4e19b9a01e1a9b37aa4b2b02ff2baac764824a33': Doc change: remove design content that has moved to material spec.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 27e82e7b: Merge "Doc change: remove design content that has moved to ↵Dirk Dougherty2015-05-0832-4319/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | material spec." into mnc-preview-docs * commit '27e82e7b3824b886ae1179c58c2f7073831d6c6a': Doc change: remove design content that has moved to material spec.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Doc change: remove design content that has moved to material spec." ↵Dirk Dougherty2015-05-0832-4319/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-preview-docs
| | | * | | | | | | | | | | | | | | Doc change: remove design content that has moved to material spec.Dirk Dougherty2015-05-0532-4319/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I335e3386633ae1e95891980b225885f5fed219b0
* | | | | | | | | | | | | | | | | | am 259a73b5: am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript ↵Joe Fernandez2015-05-081-21/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference framer page * commit '259a73b560b3acbd653167b2617810920a6f4b22': docs: remove obsolete renderscript reference framer page
| * | | | | | | | | | | | | | | | | am b2152a43: am 1dc26b8c: docs: remove obsolete renderscript reference ↵Joe Fernandez2015-05-071-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framer page * commit 'b2152a43ea8b44772fab5d29dea436f2a4ddc89b': docs: remove obsolete renderscript reference framer page
| | * | | | | | | | | | | | | | | | am 1dc26b8c: docs: remove obsolete renderscript reference framer pageJoe Fernandez2015-05-071-21/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1dc26b8c1eaa6b5aa288cecf9202e77217507fd3': docs: remove obsolete renderscript reference framer page
| | | * | | | | | | | | | | | | | | | docs: remove obsolete renderscript reference framer pageJoe Fernandez2015-05-071-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ec7ad462584d2e2b7132b1ddbf9306c9df83b10
generated by cgit v1.1 at 2025-02-13 08:42:07 +0000