summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Round rect clipping for notification contents" into mnc-devJorim Jaggi2015-05-2614-9/+167
|\
| * Round rect clipping for notification contentsJorim Jaggi2015-05-2614-9/+167
| | | | | | | | | | | | | | | | | | | | | | Enable round rect clipping on notifications for the following kind of notifications: - Big picture style. - Big media narrow style. - Custom notifications. Bug: 16142505 Change-Id: I157650fe470636ed624a81557c08135827eac0cb
* | am 97c0c444: am 4ec5140b: Merge "docs: Update the auto checklist and cleanup ↵Luan Nguyen2015-05-265-85/+155
|\ \ | | | | | | | | | | | | | | | | | | supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs * commit '97c0c444db850c7d5381c8708a235050a45ce1ad': docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification.
| * \ am 4ec5140b: Merge "docs: Update the auto checklist and cleanup supporting ↵Luan Nguyen2015-05-265-85/+155
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs * commit '4ec5140be35df2e9c49558d330df06fa985f7bc9': docs: Update the auto checklist and cleanup supporting docs that checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification.
| | * \ Merge "docs: Update the auto checklist and cleanup supporting docs that ↵Luan Nguyen2015-05-265-85/+155
| | |\ \ | | | | | | | | | | | | | | | checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification." into mnc-preview-docs
| | | * | docs: Update the auto checklist and cleanup supporting docs thatLuan Nguyen2015-05-225-85/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checklist item references. Also add information about alpha/beta Play Store channel. Reference the design spec for the 6-tap specification. bug: 20012569 bug: 20721846 bug: 19702807 Change-Id: Id42b64f36fa837b158f034d8e55f8e6d93709bb0
* | | | | am 597788c6: am 9510d046: Merge "docs: Add Voice Actions section to Audio ↵Luan Nguyen2015-05-261-3/+199
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | training lesson. Add link for Universal Media Player sample." into mnc-preview-docs * commit '597788c6f0ee484b263346544a155898579d8206': docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.
| * | | | am 9510d046: Merge "docs: Add Voice Actions section to Audio training ↵Luan Nguyen2015-05-261-3/+199
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lesson. Add link for Universal Media Player sample." into mnc-preview-docs * commit '9510d0464f1e33c8a9adf5dde7f1a503a0f20b0b': docs: Add Voice Actions section to Audio training lesson. Add link for Universal Media Player sample.
| | * | | Merge "docs: Add Voice Actions section to Audio training lesson. Add link ↵Luan Nguyen2015-05-261-3/+199
| | |\ \ \ | | | | | | | | | | | | | | | | | | for Universal Media Player sample." into mnc-preview-docs
| | | * | | docs: Add Voice Actions section to Audio training lesson.Luan Nguyen2015-05-261-3/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link for Universal Media Player sample. bug: 20008284 bug: 19839477 Change-Id: I8bd0959cd41d7dde92608301c3be986339d5bf1b
* | | | | | am 28942bbe: am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into ↵Andrew Solovay2015-05-264-196/+638
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit '28942bbe21f188ac7da502454337ceea7c6323a9': docs: M Runtime Permissions overview.
| * | | | | am 99f4bdf5: Merge "docs: M Runtime Permissions overview." into mnc-preview-docsAndrew Solovay2015-05-264-196/+638
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '99f4bdf5ff90fe17512d4a77142f254a489bccc2': docs: M Runtime Permissions overview.
| | * | | | Merge "docs: M Runtime Permissions overview." into mnc-preview-docsAndrew Solovay2015-05-264-196/+638
| | |\ \ \ \
| | | * | | | docs: M Runtime Permissions overview.Andrew Solovay2015-05-264-196/+638
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the Google Doc which has gone through tech review. See first comment for doc stage location. NOTE: Because the M Preview reference docs are not going to be live on DAC (they'll be downloadable in a zip archive, I believe), we can't put in live hyperlinks to new-for-M classes/fields/ methods. Those have to just be in <code> font with no link. This is consistent across all the preview docs, and will of course change when these docs are converted for the MNC release. bug: 21411602 bug: 21411604 Change-Id: I1163abc1dc884cf27b0e94d266f3979f131db2ab
* | | | | | | Merge "Don't leak starting window when app crashes before adding windows" ↵Wale Ogunwale2015-05-262-24/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | Don't leak starting window when app crashes before adding windowsWale Ogunwale2015-05-242-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for us to leak an app starting window if the app it is associated with fails to start before adding any windows. This causes the starting window to permanently be visible at the layer it occupies. We now remove the starting window immediately when the app token is been removed if it is the last window in the token and it isn't animating. Bug: 21375344 Change-Id: Ib3da148501645a44736c639c0181c3fabe0138e8
* | | | | | | | Merge "Add vvm type for t-mobile." into mnc-devNancy Chen2015-05-262-10/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Add vvm type for t-mobile.Nancy Chen2015-05-252-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | T-Mobile has slightly different configuration details so add a vvm type to correspond to what they use: comverse vvm. Bug: 21126480 Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
* | | | | | | | | Merge "Add fingerprint icon" into mnc-devJorim Jaggi2015-05-2612-0/+73
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Add fingerprint iconJorim Jaggi2015-05-2612-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20663748 Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8
* | | | | | | | | Merge "Polish animations for fingerprint icon" into mnc-devJorim Jaggi2015-05-2666-250/+1440
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Polish animations for fingerprint iconJorim Jaggi2015-05-2666-250/+1440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make error state animation faster. - Add animation for -- Draw on when turning on the screen -- Draw off when unlocking -- Error state -> normal state Bug: 21269675 Change-Id: If09c0a35ce194fbeeb86151d45b4cfa81c9999c5
| * | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-260-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-250-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-240-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-230-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | MediaPlayer: add mPreparing to weed out unwanted prepared messagesRobert Shih2015-05-222-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21266735 Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
| | | | | * | | | | | | BatteryStatsService: Only query bluetooth on demand.Adam Lesinski2015-05-221-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth was being queried too often, leading to more power consumption and wakelock time. Bug:21063567 Bug:21269307 Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266
| | | | | * | | | | | | Indicate failed scans with EXTRA_RESULTS_UPDATEDVinit Deshpande2015-05-223-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag indicates if scan was successful and results were updated. It will be set to false if a scan is not performed (intentionally) or if it failed to produce any results. Bug: 20642015 Change-Id: I06a1fdd684932db68891ee28d5a049980f483f0f
| | | | | * | | | | | | Keep history after reset to undo 2 cherrypicks.The Android Automerger2015-05-220-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | BatteryStatsService: Only query bluetooth on demand.Adam Lesinski2015-05-221-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth was being queried too often, leading to more power consumption and wakelock time. Bug:21063567 Bug:21269307 Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266
| | | | | | * | | | | | | Indicate failed scans with EXTRA_RESULTS_UPDATEDVinit Deshpande2015-05-223-0/+10
| | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag indicates if scan was successful and results were updated. It will be set to false if a scan is not performed (intentionally) or if it failed to produce any results. Bug: 20642015 Change-Id: I06a1fdd684932db68891ee28d5a049980f483f0f
| | | | | * | | | | | | For getHomeActivity() only return current user.Craig Mautner2015-05-214-34/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously getHomeActivity() returned the topmost home activity independent of which user was currently running. That defeated the purpose of the method. This fix returns the home activity of the current user or null if one has not yet been created. Also remove some cruft that accumulated. Fixes bug 21055376. Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
| | | | | * | | | | | | Fix application moves.Narayan Kamath2015-05-211-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't dex2oat during application moves, so we must scan the package again scanPackageDirtyLI to deduce its ABI. This is unnecessary (since a move cannot change ABIs), but we need some additional refactoring to avoid a second scan. bug: 21337469 Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d
| | | | | * | | | | | | Close race condition in binderDied()Christopher Tate2015-05-211-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible for a binderDied() call to occur while the death recipient list containing the object was being iterated, in which case we could invalidate an object reference out from under the iteration, causing a VM abort. We now interlock the binderDied() deref operation with the list's locking semantics to prevent this. Bug 15831054 Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
| | | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-210-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Write packages.list when adding/removing users.Jeff Sharkey2015-05-202-78/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FUSE daemons now rely on getting per-user GID information when packages.list is written. Normal secondary user adding/removing usually has enough PackageManager traffic to trigger a side-effect rewrite, but this change writes explicitly to handle guest users. Also obtain the user list once, and exclude dying users. During user creation we manually splice in the user ID that we're bringing online. Bug: 19924661 Change-Id: Icc5b1b169300c9dc12099be12651acbf89d6bea9
| | | | | | * | | | | | | camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-204-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
| | | | | | * | | | | | | Fix NPE in setSurfaceTexureJohn Reck2015-05-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20088412 Change-Id: I9b78636a7d89438c8924bb1bf2adba00e74366eb
| | | | | | * | | | | | | Deal more gracefully with null smallIcons.Dan Sandler2015-05-201-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, when parceling a notification with no small icon: Well, you shouldn't attempt to do this anyway, since NoMan will reject a notification without a valid smallIcon. But setServiceForeground parcels up the Notification on its own before handing it off to NoMan, so it will crash on an invalid small icon. (In general, parceling code should never ever crash, even if the object is in an undesirable state.) And when build()ing a notification: Same thing---don't build a notification with no icon; you're going to have a bad time. But maybe you're going to fix it before you hand it off to NoMan. Or maybe it's just one page of a wearable notification, so it doesn't really need its own icon. Either way, Notification shouldn't crash. Bug: 21286186 Bug: 21298403 Change-Id: Ie482cde0a3afe3aaabf07be0536551b8e4bceba0
| | | | | | * | | | | | | Don't crash in bugreport on devices without BTJason Monk2015-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21160862 Change-Id: Ia3295fc6ebbd8ad1b5d03c70c89370d09f9cbb03
| | | | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-200-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Push initial disk state, handle empty media.Jeff Sharkey2015-05-193-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stash volume count from last scan, and use it to push initial storage notifications state when listener is first attached. Also omit disks with invalid size, which usually means they're an empty slot with no media. Bug: 20503551 Change-Id: I75097035aebaad70ba32437179a863f6a0910aa5
| | | | | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-05-190-0/+0
| | | | | | | |\ \ \ \ \ \ \
* | | | | | | | \ \ \ \ \ \ \ Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-devNicolas Prevot2015-05-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Say in the doc that DISALLOW_CONFIG_VPN now works.Nicolas Prevot2015-05-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG:18902920 Change-Id: I761cba1f1e01fbe88f773887bf4e9233fc85cfef
* | | | | | | | | | | | | | | | am 125dbf89: am d313958f: Merge "docs: Add API Overview and Behavior Changes ↵Quddus Chong2015-05-265-136/+704
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs for M Developer Preview." into mnc-preview-docs * commit '125dbf895db097cd83cbeedc81571060f3f40099': docs: Add API Overview and Behavior Changes docs for M Developer Preview.
| * | | | | | | | | | | | | | | am d313958f: Merge "docs: Add API Overview and Behavior Changes docs for M ↵Quddus Chong2015-05-265-136/+704
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer Preview." into mnc-preview-docs * commit 'd313958f8ed099b90bbd3580580f4e37e9bf3c81': docs: Add API Overview and Behavior Changes docs for M Developer Preview.
| | * | | | | | | | | | | | | | Merge "docs: Add API Overview and Behavior Changes docs for M Developer ↵Quddus Chong2015-05-265-136/+704
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview." into mnc-preview-docs
| | | * | | | | | | | | | | | | | docs: Add API Overview and Behavior Changes docs for M Developer Preview.Quddus Chong2015-05-265-136/+704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4aff933b60b7eac17ccfa4f5f41f26153d464418