summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove LockPatternUtils.getCurrentUser()Adrian Roos2015-04-2816-83/+66
| | | | | Bug: 18931518 Change-Id: I177eefe466c12217cf64c85b872f71bc23c7bf05
* Require explicit userId in LockPatternUtilsAdrian Roos2015-04-2814-184/+99
| | | | | Bug: 18931518 Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
* Merge "AudioRecord device select continued" into mnc-devPaul McLean2015-04-281-3/+2
|\
| * AudioRecord device select continuedPaul McLean2015-04-281-3/+2
| | | | | | | | Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
* | Merge "Camera: document supported templates" into mnc-devYin-Chia Yeh2015-04-281-3/+19
|\ \
| * | Camera: document supported templatesYin-Chia Yeh2015-04-281-3/+19
| | | | | | | | | | | | | | | Bug: 20264663 Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
* | | Merge "Revert "Adding logging to debug SignalStrength callback missing ↵Amit Mahajan2015-04-281-18/+20
|\ \ \ | | | | | | | | | | | | issue."" into mnc-dev
| * | | Revert "Adding logging to debug SignalStrength callback missing issue."Amit Mahajan2015-04-281-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ba726f825162481644df89cf0754f4e20f2793e. Bug: 20444738 Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
* | | | Merge "Fix handling of android:onClick for ContextWrapper" into mnc-devAlan Viverette2015-04-281-31/+62
|\ \ \ \
| * | | | Fix handling of android:onClick for ContextWrapperAlan Viverette2015-04-271-31/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeclaredOnClickListener traverses up the context hierarchy until it either finds the named method or runs out of contexts. Bug: 19125347 Change-Id: I565348e2a9f5686d5c8041fbc301d44ec04d5703
* | | | | Merge "Mark actually seen notifications as seen" into mnc-devAmith Yamasani2015-04-283-13/+2
|\ \ \ \ \
| * | | | | Mark actually seen notifications as seenAmith Yamasani2015-04-283-13/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from a previous CL that was meant to have it. Change-Id: I856cee8708d988630778ba88b70deaad8730fc1f
* | | | | Camera2: add max capture stall for reprocessZhijun He2015-04-286-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19988710 Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
* | | | | Merge "Set non-starting visible resumed activity as resumed activity for the ↵Wale Ogunwale2015-04-283-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | stack" into mnc-dev
| * | | | | Set non-starting visible resumed activity as resumed activity for the stackWale Ogunwale2015-04-283-3/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ensuring visible activities for a stack we check to see if there is already a resumed activity on the stack, so if we need to start an activity that needs to be visible, we start it in the paused state if there is already a resumed activity in the stack. This was't taking into account a non-starting, visible, and resumed activity. One case this can happen is if the currently resumed activity in the stack becomes translucent and the activity behind it needs to be started because it was previously destroyed due to low memory. Bug: 19636839 Change-Id: I31670fd64d3bcbbf41823f51518ca603c7412e92
* | | | | am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for ↵Joe Fernandez2015-04-281-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android form factors" into lmp-mr1-ub-docs * commit '03cbc27845d6622c8eb7c033ec18dc535ab5d7e4': docs: Modify Branding guidelines for Android form factors
| * \ \ \ \ am 0312f377: Merge "docs: Modify Branding guidelines for Android form ↵Joe Fernandez2015-04-281-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | factors" into lmp-mr1-ub-docs * commit '0312f37785768d7931e81afe92dbeda11f132d50': docs: Modify Branding guidelines for Android form factors
| | * \ \ \ \ Merge "docs: Modify Branding guidelines for Android form factors" into ↵Joe Fernandez2015-04-281-0/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-docs
| | | * | | | | docs: Modify Branding guidelines for Android form factorsJoe Fernandez2015-04-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19835619 Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
* | | | | | | | Merge "Handle null projection properly if provider app op is not enabled." ↵Svet Ganov2015-04-281-1/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | Handle null projection properly if provider app op is not enabled.Svet Ganov2015-04-281-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00b757ef73bf4dd58217ba748520c3504350d4ba
* | | | | | | | Merge "Add KeySetManagerService unit tests." into mnc-devdcashman2015-04-282-0/+988
|\ \ \ \ \ \ \ \
| * | | | | | | | Add KeySetManagerService unit tests.dcashman2015-04-272-0/+988
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19530120 Change-Id: Ie5601f7cafd4b853c6436941cfed48622549d928
* | | | | | | | | Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-devdcashman2015-04-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Remove static modifier from KeySetManagerService issuedIds.dcashman2015-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no notion of shared issuedIds across instances of KeySetManagerService, of which there should only ever be one on the system. This is particularly troublesome for unit tests which rely on a clean slate for each KeySetManagerService invocation. Bug: 19530120 Change-Id: I41fbd5424650a74426c5aa1128ddfa6a230dcfa3
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-04-2859-177/+315
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-2859-177/+315
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-04-289-36/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-289-36/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579 Auto-generated-cl: translation import
* | | | | | | | | Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." ↵Dongwon Kang2015-04-283-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.Dongwon Kang2015-04-283-0/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20509313 Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
* | | | | | | | | Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-devMartijn Coenen2015-04-281-2/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix vmalloc memory accounting (DO NOT MERGE).Martijn Coenen2015-04-271-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VmallocUsed from meminfo sums all vmalloc'd memory areas, but it shouldn't count the areas that were mapped with ioremap(); ioremap()'d ranges usually map to I/O memory, not actual physical memory. Binder and CMA are exceptions, but in the common case we're more accurate not counting those regions either. Bug: 20483106 Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24 (cherry picked from commit f33b6292168ea6e90c9d52d477c922af23001f63)
* | | | | | | | | | Merge "Fix: End handle disappears when the selection is short." into mnc-devKeisuke Kuroyanagi2015-04-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix: End handle disappears when the selection is short.Keisuke Kuroyanagi2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HandleView#isVisible didn't use getHorizontalOffset; thus, the position is always computed as if Gravity.LEFT is set. As a result, isVisible can be wrongly false for the end handle and the handle is dismissed. Bug: 20480054 Change-Id: Ib3242000bb98ae28e0cb37bf5b05069754abbfc6
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-276-14/+14
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d Auto-generated-cl: translation import
* | | | | | | | | | am ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding ↵Joe Fernandez2015-04-281-0/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs * commit 'ff31bb4bb7d46766552526f6580a76445a549339': docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
| * | | | | | | | | am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when ↵Joe Fernandez2015-04-281-0/+19
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listening for capability node changes." into lmp-mr1-ub-docs * commit '68ef92871f52bad28d5aea168c0d3a4b863d282d': docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
| | * | | | | | | | Merge "docs: Add note about overriding onConnectedNodes() when listening for ↵Joe Fernandez2015-04-281-0/+19
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capability node changes." into lmp-mr1-ub-docs
| | | * | | | | | | | docs: Add note about overriding onConnectedNodes() when listeningLuan Nguyen2015-04-271-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for capability node changes. bug: 20523695 Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
* | | | | | | | | | | am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention ↵Joe Fernandez2015-04-282-30/+101
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addApiIfAvailable()." into lmp-mr1-ub-docs * commit '80d19484c109c4beb0e36b7ce0418ebe526ad300': docs: Update Wearable API setup to mention addApiIfAvailable().
| * | | | | | | | | | am 185002bc: Merge "docs: Update Wearable API setup to mention ↵Joe Fernandez2015-04-282-30/+101
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addApiIfAvailable()." into lmp-mr1-ub-docs * commit '185002bcc9b551828557ab6946fef7fef1c17d74': docs: Update Wearable API setup to mention addApiIfAvailable().
| | * | | | | | | | | Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into ↵Joe Fernandez2015-04-282-30/+101
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | lmp-mr1-ub-docs
| | | * | | | | | | | docs: Update Wearable API setup to mention addApiIfAvailable().Luan Nguyen2015-04-272-30/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20486912 Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
* | | | | | | | | | | Merge "MediaController: workaround to disable seek" into mnc-devRobert Shih2015-04-281-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | MediaController: workaround to disable seekRobert Shih2015-04-271-0/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An example use case is live HLS streams. Bug:19489473 Change-Id: I9c278f2875a5faaf1af092cc84888d4280a00747
* | | | | | | | | | Merge "Add some missing Settings and DayNight themes" into mnc-devAlan Viverette2015-04-276-1/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add some missing Settings and DayNight themesAlan Viverette2015-04-276-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20546201 Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
* | | | | | | | | | | Merge "Fix view outline for shadows in LayoutLib." into mnc-devDeepanshu Gupta2015-04-273-15/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix view outline for shadows in LayoutLib.Deepanshu Gupta2015-04-273-15/+23
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the bounds on the drawable before getting the view outline for shadow. Also, reuse the temp outline object in AttachInfo rather than allocating a new one each time. Change-Id: I69793d38d60c5b9f9050569f2b22fbc7b90620bf
generated by cgit v1.1 at 2025-08-04 19:25:01 +0000