summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Flags to select storage volume for app installs." into mnc-devJeff Sharkey2015-06-103-0/+18
|\
| * Flags to select storage volume for app installs.Jeff Sharkey2015-06-093-0/+18
| | | | | | | | | | | | | | | | | | Remote callers can now provide the "--install-location" value from the APK to help select a location, or they can explicitly force a volume by UUID. Bug: 21676789 Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
* | Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-devYao Chen2015-06-101-0/+1
|\ \
| * | Copy lockTaskLaunchMode from target activity to its alias.Yao Chen2015-06-091-0/+1
| | | | | | | | | | | | | | | Bug: 21675800 Change-Id: I518f71d57b0a113797fb3879b776cc7142351218
* | | Merge "Expand scrim all the way to the right" into mnc-devAdrian Roos2015-06-104-7/+68
|\ \ \
| * | | Expand scrim all the way to the rightAdrian Roos2015-06-104-7/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the scrim would not cover the area occupied by the nav bar which looks weird when the nav bar is hidden. Bug: 19582019 Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
* | | | Merge "Use who when requesting permissions" into mnc-devSvetoslav2015-06-105-30/+43
|\ \ \ \
| * | | | Use who when requesting permissionsSvetoslav2015-06-095-30/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
* | | | | Merge "Add content description to keyguard user avatar" into mnc-devAdrian Roos2015-06-104-30/+74
|\ \ \ \ \
| * | | | | Add content description to keyguard user avatarAdrian Roos2015-06-094-30/+74
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 20535812 Change-Id: I32ff0878c2332681ebd848c9da6e2dc42363b9be
* | | | | Merge "Fix NPE." into mnc-devDianne Hackborn2015-06-101-2/+4
|\ \ \ \ \
| * | | | | Fix NPE.Dianne Hackborn2015-06-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
* | | | | | Merge "media: hook up OnFrameRenderedListener events to framework events" ↵Lajos Molnar2015-06-103-36/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | media: hook up OnFrameRenderedListener events to framework eventsLajos Molnar2015-06-083-36/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20503131 Change-Id: Ife6d4862d14daf5b9659307af57417bd3532e8fe
* | | | | | | Merge "ImageWallpaper: Atomically fetch display info" into mnc-devAdrian Roos2015-06-101-20/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | ImageWallpaper: Atomically fetch display infoAdrian Roos2015-06-091-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we fetched rotation and dimens separately which had the potential to cause inconsistencies. Bug: 21440533 Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
* | | | | | | Merge "Change wtf errors from ASSERT to ERROR." into mnc-devChristopher Ferris2015-06-101-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Change wtf errors from ASSERT to ERROR.Christopher Ferris2015-06-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling println_native with the value of ASSERT will set the abort message. Unfortunately, there are numerous cases where one thread aborts, but before that thread can communicate with debuggerd, another thread calls wtf, which overwrites the abort message from the original failing thread. Fix this by changing this to an error level log message. Bug: 21490722 Change-Id: I9500e2e63eea96722602fdd46c86939c001a7c65
* | | | | | | | Merge "Dont create a dummy animation for a transferred animation" into mnc-devStefan Kuhne2015-06-102-17/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Dont create a dummy animation for a transferred animationStefan Kuhne2015-06-092-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When multiple windows get created at once, multiple starting windows will be created as well. The first window will get an animation and a dummy animation. If another window will get shown shortly after, it will receive the animation of the first starting window. However, no new dummy animation should be created for it since otherwise it might never get an animation end notification. This CL also reverts previously added changes to ignore dummy animations. reverted change: Ie907d31f51e130e245a70249a983d490f3d42b21 Bug: 21643278 Bug: 21403998 Change-Id: I228d77a2d9c3597df0eb9c340a65c0c592c35ce6
* | | | | | | | | Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into ↵Fyodor Kupolov2015-06-101-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | Do not create profile if FEATURE_MANAGED_USERS is not availableFyodor Kupolov2015-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21629701 Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
* | | | | | | | | Merge "Fix issue #21621920: VI: need mechanism to get current request" into ↵Dianne Hackborn2015-06-0913-40/+205
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | Fix issue #21621920: VI: need mechanism to get current requestDianne Hackborn2015-06-0913-40/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new APIs to associate a Request with a name, get all active requests, and get active request by name. Also add a new Activity.onProvideReferrer() which will allow applications to propagate referrer information to the assistant (and other apps they launch) in a consistent way. Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
* | | | | | | | | | Merge "initial revision of NetworkDiagnostics" into mnc-devErik Kline2015-06-092-0/+539
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | initial revision of NetworkDiagnosticsErik Kline2015-06-092-0/+539
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21449922 Change-Id: I6a66cfa98601d6ccfe38ff840b0dd49ed1538a41
* | | | | | | | | | | Merge "Switch over to updated VPN warning strings" into mnc-devRobin Lee2015-06-095-48/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Switch over to updated VPN warning stringsRobin Lee2015-06-095-48/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are more consistent and have placeholders for the description of whatever VPN apps are actually active. Bug: 20516964 Bug: 17474682 Change-Id: I37ff287b795f10bbbb192540f09f8100bb27b1a0
* | | | | | | | | | | | am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while ↵Filip Gruszczynski2015-06-091-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting an activity." * commit '6974f22d1148f0140b4abc76cc58e6bd6ad7842a': Revert "Recompute focus stack if cleared while starting an activity."
| * \ \ \ \ \ \ \ \ \ \ \ am 47e53319: Revert "Recompute focus stack if cleared while starting an ↵Filip Gruszczynski2015-06-091-14/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity." * commit '47e53319509474c2f00847ac391dd32776712470': Revert "Recompute focus stack if cleared while starting an activity."
| | * | | | | | | | | | | | Revert "Recompute focus stack if cleared while starting an activity."Filip Gruszczynski2015-06-091-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b3d573e46b8be0f0cf170802214320859c94905. Unfortunately, we need more than just that. Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01
* | | | | | | | | | | | | | am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an ↵Wale Ogunwale2015-06-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity. * commit '64b586e19f3cd4069d57424ddc21c5213c94a767': Recompute focus stack if cleared while starting an activity.
| * | | | | | | | | | | | | am 0b3d573e: Recompute focus stack if cleared while starting an activity.Wale Ogunwale2015-06-091-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b3d573e46b8be0f0cf170802214320859c94905': Recompute focus stack if cleared while starting an activity.
| | * | | | | | | | | | | | Recompute focus stack if cleared while starting an activity.Wale Ogunwale2015-06-091-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag, the activity is destoried which can also cause its task to be removed from its current stack if the activity process record is null. We now recompute the stack for the activity task when this occurs so we don't NPE later on. Bug: 19552874 Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7 (cherry picked from commit 86920fe630911cbbc0839b341dc694c2b905ef9e)
* | | | | | | | | | | | | | am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer ↵Luan Nguyen2015-06-091-87/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs * commit '33677f0c1050ae73447136ec3e88d1140a53da4b': docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
| * | | | | | | | | | | | | am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference ↵Luan Nguyen2015-06-091-87/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs * commit 'd8b632fbce276ca0e91bf2b251aff266869e1291': docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java ↵Luan Nguyen2015-06-091-87/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix links to samples and reference docs." into mnc-preview-docs
| | | * | | | | | | | | | | | | docs: Fix WatchFace guide to no longer reference deprecated Time.javaLuan Nguyen2015-06-051-87/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix links to samples and reference docs. bug: 20057886 Change-Id: I31aaad7066dabd05f1af8f7ff434ccb79f54357f
* | | | | | | | | | | | | | | | Merge "Fixed issue with using wrong display id when creating context for ↵Wale Ogunwale2015-06-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displays" into mnc-dev
| * | | | | | | | | | | | | | | | Fixed issue with using wrong display id when creating context for displaysWale Ogunwale2015-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21729214 Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
* | | | | | | | | | | | | | | | | Merge "Upload bitmaps in SkShader* safely" into mnc-devJohn Reck2015-06-093-16/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Upload bitmaps in SkShader* safelyJohn Reck2015-06-093-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19412589 Change-Id: Id50c08ff523d5540f60c39b435c0ab1b4c685655
* | | | | | | | | | | | | | | | | | Merge "Add documentation for possible AndroidKeyStore exceptions to ↵Jim Miller2015-06-091-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticate() call" into mnc-dev
| * | | | | | | | | | | | | | | | | | Add documentation for possible AndroidKeyStore exceptions to authenticate() callJim Miller2015-06-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 20864436 Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
* | | | | | | | | | | | | | | | | | | Merge "Dont ignore layer paint alpha in software path" into mnc-devChris Craik2015-06-091-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Dont ignore layer paint alpha in software pathChris Craik2015-06-091-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19412691 Change-Id: Ie56b2cbc667a078eb4a7c5bfe7b8e8dd6b0fc24b
* | | | | | | | | | | | | | | | | | | | Merge "MIDI docs: use getPorts()" into mnc-devPhil Burk2015-06-091-22/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | MIDI docs: use getPorts()Phil Burk2015-06-031-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use boolean to control synth start and stop. Add mention of feature declaration in Manifest. Add virtual MIDI devices to bullet list. Change-Id: I7b36e3ce69caf9d1d15d23f1a0836d525022ef9e Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | | | | | | | | | | Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-devTyler Gunn2015-06-092-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove use of STATE_AUDIO_ONLY in a comparison.Tyler Gunn2015-06-092-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY. - Use VideoProfile.isAudioOnly() instead of doing == comparison. Bug: 21645094 Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
generated by cgit v1.1 at 2025-03-18 19:00:30 +0000