summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace JNI primitive array critical calls with non-critical ones.Hiroshi Yamauchi2015-05-1211-1875/+2892
| | | | | | | | The files generated by glgen + manually edited util.cpp. Bug: 19235243 Change-Id: Id48d39bafc21c27fbf667ed0f4e082dda3a37be3
* Merge "Fixes for APi review" into mnc-devYorke Lee2015-05-1215-219/+180
|\
| * Fixes for APi reviewYorke Lee2015-05-1215-219/+180
| | | | | | | | | | | | | | | | | | Move CameraCapabilities into VideoProfile Make PhoneAccount and PhoneAccountHandle final Bug: 21040387 Bug: 21066505 Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
* | Specify tint on top-level vector tag, rather than fillColorAlan Viverette2015-05-129-19/+28
| | | | | | | | | | | | | | | | | | | | Ensures that setting the tint programatically or from a view XML attribute works as expected, masking against a solid color rather than a non-opaque theme color. Also specifies missing tint on ic_audio_ring_notif. Change-Id: Ib65e41eb23c5e5a2f44264ee32681f7ac943ecc4
* | Merge "Rename Connection time APIs for Conference.java" into mnc-devSantos Cordon2015-05-123-14/+38
|\ \
| * | Rename Connection time APIs for Conference.javaSantos Cordon2015-05-123-15/+39
| | | | | | | | | | | | | | | Bug: 21072487 Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd
* | | Merge "Ignore abandon after install relinquished." into mnc-devJeff Sharkey2015-05-121-2/+9
|\ \ \
| * | | Ignore abandon after install relinquished.Jeff Sharkey2015-05-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently changed the install flow to fully dexopt before renaming the staging directory. This exposed the ability for the session owner to abandon and destroy the stage contents while dexopt was still happening. Due to SELinux rules, the abandon would fail to clean up the stage directory, and PackageManager would "successfully" rename and install that stage, which now only contained the oat/ directory. To avoid this case, we now ignore abandon requests once we've passed the "point of no return" and relinquished our stage over to PackageManagerService. Bug: 20175072 Change-Id: I4ad5b1eba0e38f1315b8330bd95be6e3bc6c635a
* | | | Merge "Always use REGISTERED_ONLY when appropriate." into mnc-devDianne Hackborn2015-05-121-2/+6
|\ \ \ \
| * | | | Always use REGISTERED_ONLY when appropriate.Dianne Hackborn2015-05-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would only check mProcessesReady when going through the public calls to send broadcasts; now handle it even if the activity manager is calling its internal implementation. Change-Id: I702b4cb85b35a7a051ef05c9875a39f5fa03f0f1
* | | | | Merge "Add RemoteConference javadocs." into mnc-devSantos Cordon2015-05-122-10/+111
|\ \ \ \ \
| * | | | | Add RemoteConference javadocs.Santos Cordon2015-05-122-10/+111
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 21066411 Change-Id: Ie4cdfef58e6442531c3377cec4a708d67b790945
* | | | | Merge "Camera2: stream configs for reprocessible session" into mnc-devChien-Yu Chen2015-05-122-27/+118
|\ \ \ \ \
| * | | | | Camera2: stream configs for reprocessible sessionChien-Yu Chen2015-05-082-27/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the guaranteed stream configurations for creating reprocessible capture sessions to the docs. Bug: 20263562 Change-Id: Id46d6ec8ebe7a5fe7edcb7c15325c6b53f1bc589
* | | | | | Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." ↵Wale Ogunwale2015-05-121-12/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Determine if TaskRecord is privilaged from creating ActivityInfo.Wale Ogunwale2015-05-121-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not reliable to try to get it from the process since it might not be running yet. Bug: 20016740 Change-Id: If3e748a97015c6623741d9374ab4ed1ed5f4b11f
* | | | | | | Merge "DNDTile: Notify of value changes." into mnc-devJohn Spurlock2015-05-121-1/+6
|\ \ \ \ \ \ \
| * | | | | | | DNDTile: Notify of value changes.John Spurlock2015-05-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21055789 Change-Id: If9008b13a6a5583832fc4dfaa8ec3e21b61cb25c
* | | | | | | | Merge "Flatten KeyStoreKeyProperties constants." into mnc-devAlex Klyubin2015-05-1213-551/+439
|\ \ \ \ \ \ \ \
| * | | | | | | | Flatten KeyStoreKeyProperties constants.Alex Klyubin2015-05-1213-551/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves constants/flags declared in inner classes of KeyStoreKeyProperties into KeyStoreKeyProperties, as requested by API Council. Bug: 21039983 Change-Id: I84a3c983e13644a027bed9f605ab8044220a352c
* | | | | | | | | Merge "Zen: Ringer mode integration fixes." into mnc-devJohn Spurlock2015-05-123-41/+94
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Zen: Ringer mode integration fixes.John Spurlock2015-05-123-41/+94
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Properly mute media + alarm streams in total silence. - Allow system components to update the "ringer mode affected" streams dynamically. - Improve dumpsys output for ringer mode streams (include names). - Remember last ringer mode properly when entering dnd via a volume down (so we can restore it properly when exiting). Bug: 20854925 Bug: 20950463 Bug: 20756527 Change-Id: I80afc1f639ff802c541020e25ade1b23e9997ef9
* | | | | | | | | Merge "Revert "Fix build - Revert "Revert "Use default constructor to get ↵Chris Craik2015-05-128-16/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anti-aliasing"""" into mnc-dev
| * | | | | | | | | Revert "Fix build - Revert "Revert "Use default constructor to get ↵Chris Craik2015-05-128-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anti-aliasing""" Fix import This reverts commit 7ed1431c83286abc83b9e5afc45fbd21ecb777b1. Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b
* | | | | | | | | | Merge "Remove obsolete fields from InputMethodManager." into mnc-devYohei Yukawa2015-05-121-10/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove obsolete fields from InputMethodManager.Yohei Yukawa2015-05-121-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMM#mViewTopLeft and IMM#mViewToScreenMatrix are no longer used. They should have not been removed in I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef. Change-Id: Ia685956c8f7dda1143135345ee9a3873705975ef
* | | | | | | | | | | Merge "Tests for Notification object construction and parceling." into mnc-devDan Sandler2015-05-1228-0/+595
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tests for Notification object construction and parceling.Dan Sandler2015-05-1128-0/+595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests use the new hidden Parcel APIs (if available on the running platform) to emit statistics about ashmem usage. Bug: 20153922 Bug: 20079551 Change-Id: I400d2a932f297e582c335389570f93c0d4a19fc9
* | | | | | | | | | | | Merge "Fix crash in setup wizard" into mnc-devJason Monk2015-05-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix crash in setup wizardJason Monk2015-05-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear out any unhandled worker messages before stopping tracking. Bug: 21048197 Change-Id: I3792215a1e7799bdb93587cd7158c4d5d86de348
* | | | | | | | | | | | am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: ↵Rich Slogar2015-05-122-31/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renderscript using gradle settings" into lmp-docs * commit '353232ecee06d1828d8628c4e3917e3b428485aa': docs: renderscript using gradle settings
| * \ \ \ \ \ \ \ \ \ \ \ am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using ↵Rich Slogar2015-05-122-31/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gradle settings" into lmp-docs * commit 'b97afd418558fbe5cf37a17302a84a9d907490e6': docs: renderscript using gradle settings
| | * \ \ \ \ \ \ \ \ \ \ \ am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" ↵Rich Slogar2015-05-122-31/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit 'a27dd186b265b58eae490d4e19ec11268ea54f12': docs: renderscript using gradle settings
| | | * \ \ \ \ \ \ \ \ \ \ \ am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docsRich Slogar2015-05-122-31/+81
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e78f136b1dbe11dc98c5699da24df49fd9dae795': docs: renderscript using gradle settings
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: renderscript using gradle settings" into lmp-docsRich Slogar2015-05-122-31/+81
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | docs: renderscript using gradle settingsRich Slogar2015-03-122-31/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13532631 Change-Id: I35808faf3fae8706ca6f9e46408c791594ab1467
* | | | | | | | | | | | | | | | | Merge "MediaSync: rename bufferIndex to bufferId." into mnc-devWei Jia2015-05-121-17/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | MediaSync: rename bufferIndex to bufferId.Wei Jia2015-05-121-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20887706 Change-Id: I98887832bc2211614a19a3718b46d6da100f6c9b
* | | | | | | | | | | | | | | | | | Merge "Change attribute values per API council." into mnc-devOlawale Ogunwale2015-05-124-21/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Change attribute values per API council.Craig Mautner2015-05-124-21/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lockTaskModeDefault => default lockTaskModeNever => never lockTaskModeIfWhitelisted => if_whitelisted lockTaskModeAlways => always Fixes bug 20642190. Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4
* | | | | | | | | | | | | | | | | | | Merge "Move visibleBehind activities into stop state when ↵Wale Ogunwale2015-05-121-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sleeping/powerDown" into mnc-dev
| * | | | | | | | | | | | | | | | | | | Move visibleBehind activities into stop state when sleeping/powerDownWale Ogunwale2015-05-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19523564 Change-Id: I95273a659edc91c5636d6a0d9cd7fe5683ec4f3e
* | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - Display mode switches." into mnc-devP.Y. Laligand2015-05-1220-239/+658
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | DO NOT MERGE - Display mode switches.P.Y. Laligand2015-05-1120-239/+658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Knowledge of the various modes of a display is now available to apps, and they can request a specific mode for their windows. b/18241736 Change-Id: I8eb16ff713e878512faca3ca6662254f08a9be7f (cherry picked from commit 5c7773d86484aac5737667c604bd8fe8150c2136)
* | | | | | | | | | | | | | | | | | | | Merge "Avoid setting mCurFrame to -1" into mnc-devDoris Liu2015-05-121-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Avoid setting mCurFrame to -1Doris Liu2015-05-121-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the dedicated flag mRunning to check whether the DrawableAnimation is running, rather than comparing mCurFrame with -1. This CL aims to simplify the use of mCurFrame. Bug: 17112962 Change-Id: I15f9e4c102f504b8c806f029949fe9ec872479a5
* | | | | | | | | | | | | | | | | | | | | Merge "Link to magic constants used by AndroidKeyStore API." into mnc-devAlex Klyubin2015-05-124-45/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Link to magic constants used by AndroidKeyStore API.Alex Klyubin2015-05-114-45/+128
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the Javadocs of AndroidKeyStore methods which take constants defined in KeyStoreKeyProperties to contain a link to the corresponding set of constants and an example of a couple of accepted constants, to make it easier to understand and find out what constants to use. Bug: 18088752 Change-Id: I338134ef136db62a7caca782cb59dbebdc996670
* | | | | | | | | | | | | | | | | | | | | Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-devChristopher Tate2015-05-123-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Deprecate Context.MODE_MULTI_PROCESSChristopher Tate2015-05-113-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has never worked the way people expect. Change-Id: I0633aacc5ed171495d9c3b51201b7ba86b666dc5
generated by cgit v1.1 at 2025-02-04 23:33:58 +0000