summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f388c9e6: am f3d3856f: Merge "Check for null codec from ↵Andy Hung2015-04-301-4/+5
|\ | | | | | | | | | | | | AMediaCodec_createDecoderByType" into mnc-dev * commit 'f388c9e654781c26debe53a0eecce5b6d9234373': Check for null codec from AMediaCodec_createDecoderByType
| * am f3d3856f: Merge "Check for null codec from ↵Andy Hung2015-04-301-4/+5
| |\ | | | | | | | | | | | | | | | | | | AMediaCodec_createDecoderByType" into mnc-dev * commit 'f3d3856f3e7b76765dfef6e94a4031c008f53b99': Check for null codec from AMediaCodec_createDecoderByType
| | * Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-devAndy Hung2015-04-301-4/+5
| | |\
| | | * Check for null codec from AMediaCodec_createDecoderByTypeAndy Hung2015-04-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NULL codec can now occur if codec cannot be created. Bug: 20566134 Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
* | | | am c7bf0a6a: am 3f9dc836: Merge "MidiFramer: Support realtime messages ↵Mike Lockwood2015-04-301-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | contained within SysEx messages." into mnc-dev * commit 'c7bf0a6afb8918fa6fdd469cbd6383188b1d2564': MidiFramer: Support realtime messages contained within SysEx messages.
| * | | am 3f9dc836: Merge "MidiFramer: Support realtime messages contained within ↵Mike Lockwood2015-04-301-2/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | SysEx messages." into mnc-dev * commit '3f9dc836c41ef6bdf812acc1803c849389ee6294': MidiFramer: Support realtime messages contained within SysEx messages.
| | * | Merge "MidiFramer: Support realtime messages contained within SysEx ↵Mike Lockwood2015-04-301-2/+7
| | |\ \ | | | | | | | | | | | | | | | messages." into mnc-dev
| | | * | MidiFramer: Support realtime messages contained within SysEx messages.Mike Lockwood2015-04-281-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix off by one error that occurred if a SysEx message ended in the middle of the buffer being processed. Change-Id: I055f005610c7b091012a30b306786114c5d9bf8d
* | | | | am 4d146ed2: am f7b795ca: Merge "Update use of procstate for services." into ↵Dianne Hackborn2015-04-3020-27/+78
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '4d146ed236b700da85197242b557c052032d16da': Update use of procstate for services.
| * | | | am f7b795ca: Merge "Update use of procstate for services." into mnc-devDianne Hackborn2015-04-3020-27/+78
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f7b795ca1a552909d333ed3f2d5ec881a8b23144': Update use of procstate for services.
| | * | | Merge "Update use of procstate for services." into mnc-devDianne Hackborn2015-04-3020-27/+78
| | |\ \ \
| | | * | | Update use of procstate for services.Dianne Hackborn2015-04-2920-27/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a separate foreground service proc state (above a sleeping top app), update various system services to put their bindings into this state when appropriate. There are two new bind flags for this -- one that just always makes it a foreground service, another that only does it when the device is awake (useful for things like the wallpaper). And with all of that, tweak network policy manager to only include apps that are at least foreground service state when in power save and device idle modes. This will allow us to further reduce the set of apps that have network access (in particular not giving access to the current top app when the screen is off), hopefully leading to even better battery life. Change-Id: I91d85a5c5ed64e856149e9a5d94a634a7925ec7f
* | | | | | am 5545d518: am 508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into ↵Miao Wang2015-04-303-66/+198
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '5545d518534b619f7d865b93d4b2d73abcd3a4a6': [RenderScript] Enable L2 BLAS APIs
| * | | | | am 508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-devMiao Wang2015-04-303-66/+198
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '508a2870e97531133d2e9690e7fc3bb6d7685d11': [RenderScript] Enable L2 BLAS APIs
| | * | | | Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-devMiao Wang2015-04-303-66/+198
| | |\ \ \ \
| | | * | | | [RenderScript] Enable L2 BLAS APIsMiao Wang2015-04-233-66/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I484a185a79190da365ac832b90bb3bedb8bbca48
* | | | | | | am f8e9fd2c: am a57a8a8c: Merge "[RenderScript] improve & minor fixes of L2 ↵Miao Wang2015-04-301-42/+82
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BLAS validation." into mnc-dev * commit 'f8e9fd2c8b629eeb91cb8f2986227392e621622b': [RenderScript] improve & minor fixes of L2 BLAS validation.
| * | | | | | am a57a8a8c: Merge "[RenderScript] improve & minor fixes of L2 BLAS ↵Miao Wang2015-04-301-42/+82
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | validation." into mnc-dev * commit 'a57a8a8cc9e39da2c5f82db3c90cd534bf93fe94': [RenderScript] improve & minor fixes of L2 BLAS validation.
| | * | | | | Merge "[RenderScript] improve & minor fixes of L2 BLAS validation." into mnc-devMiao Wang2015-04-301-42/+82
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | [RenderScript] improve & minor fixes of L2 BLAS validation.Miao Wang2015-04-231-42/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8dd0f9d4c7db03df22763a80fa6d600539be7c1
* | | | | | | am e2341e2b: am 634160a0: Merge "[RenderScript] Fix HEMM and SYRK in ↵Miao Wang2015-04-303-16/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IntrinscBLAS to correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev * commit 'e2341e2b0532b0f50c91419432c82aefc1ef8eb4': [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
| * | | | | | am 634160a0: Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to ↵Miao Wang2015-04-303-16/+16
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev * commit '634160a0567be4c8184e074f38d9f8daa9303983': [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
| | * | | | | Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle ↵Miao Wang2015-04-303-16/+16
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | complex 'Alpha' and 'Beta'" into mnc-dev
| | | * | | | [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handleMiao Wang2015-04-223-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complex 'Alpha' and 'Beta' Change-Id: I0aed57d41b0199d5c6dd3c31ca33644a5634dc35
* | | | | | | am d232e636: am 0f1a3972: Merge "Stash modulation alpha until ColorStateList ↵Alan Viverette2015-04-301-4/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has resolved base color" into mnc-dev * commit 'd232e636f24b8bc67dde8decd006d542bafb15f8': Stash modulation alpha until ColorStateList has resolved base color
| * | | | | | am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved ↵Alan Viverette2015-04-301-4/+23
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base color" into mnc-dev * commit '0f1a3972c18371359c39e6789607621bf0989181': Stash modulation alpha until ColorStateList has resolved base color
| | * | | | | Merge "Stash modulation alpha until ColorStateList has resolved base color" ↵Alan Viverette2015-04-291-4/+23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | | * | | | | Stash modulation alpha until ColorStateList has resolved base colorAlan Viverette2015-04-291-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where specifying an explicit modulation alpha and a theme-dependent base color discarded the modulation alpha during applyTheme(). Sets the YOU MESSED UP YOUR THEME color to magenta, which matches the behavior for RippleDrawable and should expose any remaining issues in a painfully obvious way. Bug: 20690409 Change-Id: I7a44f4bc4a5a85be6d3f27087b2d6c9ea12e1d29
* | | | | | | | am ad8aa59f: am 8cc1d3db: Merge changes from topic \'PasspointUI\' into mnc-devVinit Deshpande2015-04-303-18/+110
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad8aa59f70e2a27cf6b12a982f536d158f219ac4': Implement 'Available via Passpoint' feature [DO NOT MERGE] Fix settings UI for passpoint networks [DO NOT MERGE]
| * | | | | | | am 8cc1d3db: Merge changes from topic \'PasspointUI\' into mnc-devVinit Deshpande2015-04-303-18/+110
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8cc1d3dba4e06c47669c5b0c0d12b24ba70cd57a': Implement 'Available via Passpoint' feature [DO NOT MERGE] Fix settings UI for passpoint networks [DO NOT MERGE]
| | * | | | | | Merge changes from topic 'PasspointUI' into mnc-devVinit Deshpande2015-04-293-18/+110
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Implement 'Available via Passpoint' feature [DO NOT MERGE] Fix settings UI for passpoint networks [DO NOT MERGE]
| | | * | | | | | Implement 'Available via Passpoint' feature [DO NOT MERGE]Vinit Deshpande2015-04-293-21/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the issues related to explicit connection to passpoint AP, and fixes occassional mention of 'connected via Wi-Fi Assistent' Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6 (cherry picked from commit ff783cd6cfc82870a6126fe1ef019d21131423fc)
| | | * | | | | | Fix settings UI for passpoint networks [DO NOT MERGE]Vinit Deshpande2015-04-293-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes showing the friendly name in saved networks list and 'Connected via provider' addition for passpoint connections. Change-Id: If330baa96dedb099d5989b3df5b9778bbbcb15e3 (cherry picked from commit 597f49cdda63fef1b583e2053341485e8d4e2371)
* | | | | | | | | am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for ↵Andy Hung2015-04-303-66/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack JNI" into mnc-dev * commit 'f17dd0b48c894fda00b1d2068ef54b05221b1d7a': Pass PlaybackSettings as class object for AudioTrack JNI
| * | | | | | | | am 1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack ↵Andy Hung2015-04-303-66/+41
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNI" into mnc-dev * commit '1afdbe3b77959c4b37d33c19727651ca2046a0ff': Pass PlaybackSettings as class object for AudioTrack JNI
| | * | | | | | | Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-devAndy Hung2015-04-293-66/+41
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Pass PlaybackSettings as class object for AudioTrack JNIAndy Hung2015-04-293-66/+41
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
* | | | | | | | am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." ↵Alex Klyubin2015-04-3011-83/+164
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '789d9dc733d4a3a15e83eb2aa0e49f548fe81618': Add KeyPermanentlyInvalidatedException.
| * | | | | | | am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-devAlex Klyubin2015-04-3011-83/+164
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '33c9dde90d480fe457295dde37baa730d0cbc819': Add KeyPermanentlyInvalidatedException.
| | * | | | | | Merge "Add KeyPermanentlyInvalidatedException." into mnc-devAlex Klyubin2015-04-2911-83/+164
| | |\ \ \ \ \ \
| | | * | | | | | Add KeyPermanentlyInvalidatedException.Alex Klyubin2015-04-2911-83/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables users of AndroidKeyStore crypto to differentiate between the key being unusable until the user is authenticated (UserNotAuthenticatedException) and the key being permanently unusable (KeyPermanentlyInvalidatedException). The latter is the case when the secure lock screen has been disabled or reset, and, for keys that require user authentication for every use, when a new fingerprint is enrolled or all fingerprints are unenrolled. NOTE: The KeyPermanentlyInvalidatedException subsumes/replaces the NewFingerprintEnrolledException which has thus been removed. There is no way to find out whether a key was permenently invalidated specifically because a new fingerprint was added. Bug: 20642549 Bug: 20526234 Change-Id: I0206cd99eef5c605c9c4d6afc5eea02eb3b1fe6b
* | | | | | | | | am 850c1888: am 490d23bf: Merge "[Update API]: Rename accountAuthenticated ↵Simranjit Singh Kohli2015-04-294-27/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to notifyAccountAuthenticated and other changes." into mnc-dev * commit '850c1888f5855b340e8e26c4d7bc0580644dbcb8': [Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
| * | | | | | | | am 490d23bf: Merge "[Update API]: Rename accountAuthenticated to ↵Simranjit Singh Kohli2015-04-294-27/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifyAccountAuthenticated and other changes." into mnc-dev * commit '490d23bf55360219652d5177baefcba9377e2f4d': [Update API]: Rename accountAuthenticated to notifyAccountAuthenticated and other changes.
| | * | | | | | | Merge "[Update API]: Rename accountAuthenticated to ↵Simranjit Singh Kohli2015-04-294-27/+10
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifyAccountAuthenticated and other changes." into mnc-dev
| | | * | | | | | | [Update API]:Simranjit Singh Kohli2015-04-284-29/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename accountAuthenticated to notifyAccountAuthenticated and other changes. Bug: 20642769 Change-Id: I7e69d6a9492691429af0d7c2f405e01e265fcedd
* | | | | | | | | | am 8fcd6951: am db2af234: Merge "Update use of A-GPS modes in ↵destradaa2015-04-291-3/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GpsLocationProvider b/20664846" into mnc-dev * commit '8fcd695187c2895e2dd0a1a15994a730501d19c2': Update use of A-GPS modes in GpsLocationProvider b/20664846
| * | | | | | | | | am db2af234: Merge "Update use of A-GPS modes in GpsLocationProvider ↵destradaa2015-04-291-3/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/20664846" into mnc-dev * commit 'db2af23408a5b92011f9384bfb320ac8843f22b3': Update use of A-GPS modes in GpsLocationProvider b/20664846
| | * | | | | | | | Merge "Update use of A-GPS modes in GpsLocationProvider b/20664846" into mnc-devdestradaa2015-04-291-3/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update use of A-GPS modes in GpsLocationProviderdestradaa2015-04-291-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/20664846 This change reflects the documentation changes made in gps.h for the upcoming Android release. Change-Id: Id3e04492febdabd42e91a12e221d1192947b8061
* | | | | | | | | | | am 914967ab: am b351db72: Merge "Volume: dismiss volume UI to avoid HUNs." ↵John Spurlock2015-04-294-8/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '914967ab0c0193eac92507e5644d27045d2b9f85': Volume: dismiss volume UI to avoid HUNs.
generated by cgit v1.1 at 2025-02-09 07:13:18 +0000