summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-03-272-4/+4
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-03-262-4/+4
| | | | | | | | | | Change-Id: I2a3bcccf660a5a5247b3f54a8a3783ddeae7ccfa Auto-generated-cl: translation import
* | Merge "Make setServer() safe to call multiple times"Marco Nelissen2014-03-271-2/+7
|\ \
| * | Make setServer() safe to call multiple timesMarco Nelissen2014-03-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it safe to call setServer() multiple times with the same server, different servers, or null. b/13622801 Change-Id: Id04440df720f830e67106eb543653ace42430d97
* | | am af89d7e2: am bffd4d43: Merge "Check return values for null." into ↵Craig Mautner2014-03-272-4/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27': Check return values for null.
| * \ \ am bffd4d43: Merge "Check return values for null." into klp-modular-devCraig Mautner2014-03-272-4/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'bffd4d437d133164877c6a194d6a533299072fae': Check return values for null.
| | * \ \ Merge "Check return values for null." into klp-modular-devCraig Mautner2014-03-272-4/+22
| | |\ \ \
| | | * | | Check return values for null.Craig Mautner2014-03-272-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Display has been removed there is a delay until all of its windows have been removed. Therefore there is a possibility that WindowState.getDisplayContent() returns null. Guard against that possibility. Fixes bug 13616765. Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
* | | | | | am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable ↵Scott Main2014-03-275-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with new underscore format * commit '653aa40ef5d21286382217a36d956213a1018b37': update viewport variable with new underscore format
| * | | | | am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new ↵Scott Main2014-03-275-5/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underscore format * commit '7b190e0f1df16346696465c0114179b423afc26d': update viewport variable with new underscore format
| | * | | | am 22b483ee: am bbaf11f4: update viewport variable with new underscore formatScott Main2014-03-275-5/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '22b483ee6e029dc9db4ae390b91c449b7977273d': update viewport variable with new underscore format
| | | * \ \ \ am bbaf11f4: update viewport variable with new underscore formatScott Main2014-03-275-5/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830': update viewport variable with new underscore format
| | | | * | | | update viewport variable with new underscore formatScott Main2014-03-275-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
* | | | | | | | Merge "Unlinked providers STILL shouldn't cause crashes"Christopher Tate2014-03-271-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Unlinked providers STILL shouldn't cause crashesChristopher Tate2014-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 13651057 Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
* | | | | | | | | am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full ↵Craig Mautner2014-03-271-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | screen activity" * commit '723f7bbcf34168b216421eee4b7d86199f90de1f': Do not show Home behind full screen activity
| * | | | | | | am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f': Do not show Home behind full screen activity
| | * \ \ \ \ \ \ am a2824410: Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a282441038b8a82be1b9b6afc41145e5570ce377': Do not show Home behind full screen activity
| | | * \ \ \ \ \ \ Merge "Do not show Home behind full screen activity"Craig Mautner2014-03-271-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Do not show Home behind full screen activityYevgen Pronenko2014-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ensureActivitiesVisibleLocked goes through foreground activity stack and reaches non-fullscreen activity, it sets showHomeBehindStack variable to true. If there is a fullscreen activity behind, showHomeBehindStack remains unchanged, which causes Home application to be displayed anyway. In this case user will see a fullscreen activity and Home activity simultaneously. To fix the issue we set showHomeBehindStack to false when we reach fullscreen activity in the activity stack. This was made visible by the following commit: 446ef1de8d373c1b017df8d19ebf9a47811fb402 Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
* | | | | | | | | | | Merge "Expand install observer semantics"Christopher Tate2014-03-2712-47/+485
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Expand install observer semanticsChristopher Tate2014-03-2712-47/+485
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and now fail conservatively when two apps both attempt to define the same permission. Apps signed with the same certificate are permitted to redefine permissions. We also finally have a (hidden) interface class for observing package installation so that we can now rev the interface without breaking existing callers. Bug 13551375 Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
* | | | | | | | | | | | Merge "Update framework to use M34 version of Skia."Leon Scroggins2014-03-278-161/+70
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update framework to use M34 version of Skia.Leon Scroggins2014-03-278-161/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are needed due to changes in the Skia API. Depends on https://googleplex-android-review.git.corp.google.com/#/c/439626/1 (Ic3cf846b74d6f10ec30c477b50fd774cc30ad52c) BitmapFactory.cpp: Use SkColorType instead of SkBitmap::Config, where possible. Call SkBitmap::info() instead of deprecated SkBitmap::asImageInfo(). Remove calls to deprecated SkBitmap::getSize64(). Canvas.cpp: ColorFilter.cpp: Matrix.cpp Remove the deprecated SK_SCALAR_IS_FIXED path. Leave in an else case for SK_SCALAR_IS_FLOAT, to allow for eventual SK_SCALAR_IS_DOUBLE path. Graphics.cpp: Like in BitmapFactory.cpp, use new methods for determining the size of pixels. Paint.cpp: Use more precise SkScalar_ToInt versions of macros. TextLayoutCache.cpp: Fix bug in macro definition for HB_SurrogateToUcs4. Use the new name for SkCreateTypefaceForScriptNG. android_view_SurfaceControl.cpp: Replace ScreenshotPixelRef with a Skia pixel ref. This is a merge from master-skia branch: https://googleplex-android-review.git.corp.google.com/#/c/430554/ (Ie11503bcefd3883c466279fde5ce147c8a72b452) Change-Id: Idf15746f93dabeb7862ac02cc6bd925f0dcc68ba
* | | | | | | | | | | | am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a5c6e6812d3e69fb0f9247a9010918de94a10fe': fix bug in code snippet
| * | | | | | | | | | | am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4243710bf8b4bf3a0bec9c4cf3b00e4b69651883': fix bug in code snippet
| | * | | | | | | | | | am 89f4a546: am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4': fix bug in code snippet
| | | * | | | | | | | | am 0c933df6: fix bug in code snippetScott Main2014-03-271-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c933df6d09dfb3923e0891028c67249bc8887d5': fix bug in code snippet
| | | | * | | | | | | | fix bug in code snippetScott Main2014-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
* | | | | | | | | | | | Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes"Adam Lesinski2014-03-2729-504/+415
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-2729-504/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:13028925 Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
* | | | | | | | | | | | | am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use ↵Colin Cross2014-03-271-22/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_MULTILIB := both" * commit 'c1a7d0758de065da80129baa85f1471e67c7fe21': app_process: use LOCAL_MULTILIB := both
| * | | | | | | | | | | am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '232d422405d686eb493b48370a2b2f7c35fe96fb': app_process: use LOCAL_MULTILIB := both
| | * | | | | | | | | | am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0ffa8a38e90f64912686833dba9823b251fae57': app_process: use LOCAL_MULTILIB := both
| | | * | | | | | | | | Merge "app_process: use LOCAL_MULTILIB := both"Colin Cross2014-03-271-22/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | app_process: use LOCAL_MULTILIB := bothColin Cross2014-03-271-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_MULTILIB := both to build app_process64 instead of duplicating the build rule. Also causes PRODUCT_PACKAGES := app_process to install both versions on 64-bit platforms, as the module names for both app_process and app_process64 are now app_process. Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
* | | | | | | | | | | | | resolved conflicts for merge of 6984e4f9 to masterAdam Lesinski2014-03-271-30/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: services/core/java/com/android/server/notification/NotificationManagerService.java Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
| * | | | | | | | | | | | am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into ↵Adam Lesinski2014-03-271-22/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'fc680b89184fb60cf9a58e81d7f890002310702d': Fix a race in NotificationManager with Listeners
| | * | | | | | | | | | | Merge "Fix a race in NotificationManager with Listeners" into klp-modular-devAdam Lesinski2014-03-271-22/+27
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix a race in NotificationManager with ListenersAdam Lesinski2014-03-261-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After being bound to, a NotificationListenerService could make a call into NotificationManagerService before having been added to the list of active services. Bug: 13644375 Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
* | | | | | | | | | | | | | Merge "Improved integration of NotificationStackScroller"Selim Cinek2014-03-271-42/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Improved integration of NotificationStackScrollerSelim Cinek2014-03-271-42/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quicksettings and clear all buttons now work correctly with NotificationStackScroller but visuals are still tbd Change-Id: Ia8a0895f66e0b682f39ac62d92c6b6cfccce2ee2
* | | | | | | | | | | | | | | Merge "Async drawing!"John Reck2014-03-2712-57/+294
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Async drawing!John Reck2014-03-2712-57/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
* | | | | | | | | | | | | | | Merge "Add a mediastore constant for playlists."Matt Casey2014-03-272-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add a mediastore constant for playlists.Matt Casey2014-03-262-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a followup to https://googleplex-android-review.git.corp.google.com/415218 I'm writing this change at the request of elmas@. Bug: 13657009 Change-Id: I970cc59a33af2162c2488c4ddf628f7a73009cd6
* | | | | | | | | | | | | | | | Fix build.Jorim Jaggi2014-03-274-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia31e410d1ae0f60f1df7fceea7bf5fd082cc425d
* | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 22d07464 to master"Narayan Kamath2014-03-2718-84/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 22d07464 to masterNarayan Kamath2014-03-2718-84/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
| | * | | | | | | | | | | | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-2721-96/+106
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
generated by cgit v1.1 at 2025-04-02 11:04:47 +0000