summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Clean up time picker attributes and drawing code"Alan Viverette2015-03-3010-148/+201
|\
| * Clean up time picker attributes and drawing codeAlan Viverette2015-03-2410-148/+201
| | | | | | | | Change-Id: I16283d666f49885855a5f9bb3781cea07af058fd
* | Merge "Move MIDI utilities for internal use to com.android.internal.midi ↵Mike Lockwood2015-03-308-11/+551
|\ \ | | | | | | | | | package"
| * | Move MIDI utilities for internal use to com.android.internal.midi packageMike Lockwood2015-03-308-11/+551
| | | | | | | | | | | | Change-Id: I7393ae1d4bca61667fb6ee809a7aa22c5c48de56
* | | am b64b7885: (-s ours) am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import ↵Geoff Mendal2015-03-300-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'b64b78856cf6121e9956f8910f30656ebde5d024': Import translations. DO NOT MERGE
| * \ \ am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6e22b3293298b721815b321b503cbe4ce34ae77d': Import translations. DO NOT MERGE
| | * \ \ am 6e6250b9: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-300-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e6250b9613e7c236a07367fc800feece8bcd706': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-03-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893 Auto-generated-cl: translation import
* | | | | | am e9669588: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-300-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e9669588c22eeae992e6b6d237f311856e4886c2': Import translations. DO NOT MERGE
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I451a8edb373ffeeddb1d05d6e5c15ff35d4c9109 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-303-32/+24
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-303-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I401a825e79422050bc39fff0b7c8998354082478 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-301-2/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33c678add2505ec35670928d3e0c0c9751c66bda Auto-generated-cl: translation import
* | | | | | Merge "Editor: Cleanup the unused ActionPopupWindow"Clara Bayarri2015-03-301-92/+0
|\ \ \ \ \ \
| * | | | | | Editor: Cleanup the unused ActionPopupWindowClara Bayarri2015-03-241-92/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unused since we removed the paste popup Change-Id: Id609d43a9f9f9bc31b2f40286ca1fe88773ad1dd
* | | | | | | Merge "CEC: Do not send <ARC Terminated> when init request gets rejected"Jinsuk Kim2015-03-303-8/+11
|\ \ \ \ \ \ \
| * | | | | | | CEC: Do not send <ARC Terminated> when init request gets rejectedJinsuk Kim2015-03-303-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System audio may reject <Request ARC Initiation> with a response <Feature Abort> or just time out. Do not send <Request ARC Terminated> in response so as not to turn off the ARC mode, as it may not be the intended behavior. Bug: 19928094 Change-Id: I469dfa53bf35dfbca7daa86a69763b10551663ec
* | | | | | | | am 2169c68a: am d9dddea5: am 631565ab: Merge "Change ↵Mathieu Chartier2015-03-301-23/+15
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDeclaredFieldsUnchecked call to new return value" * commit '2169c68aa330670ab340ec7faaedb5e5a9a59360': Change getDeclaredFieldsUnchecked call to new return value
| * | | | | | | am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to ↵Mathieu Chartier2015-03-301-23/+15
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new return value" * commit 'd9dddea504d717120eaa5e9c15fe484e26511e92': Change getDeclaredFieldsUnchecked call to new return value
| | * | | | | | am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value"Mathieu Chartier2015-03-291-23/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '631565abd6cadd65befe197afa7bac0d44f70fb2': Change getDeclaredFieldsUnchecked call to new return value
| | | * \ \ \ \ \ Merge "Change getDeclaredFieldsUnchecked call to new return value"Mathieu Chartier2015-03-291-23/+15
| | | |\ \ \ \ \ \
| | | | * | | | | | Change getDeclaredFieldsUnchecked call to new return valueMathieu Chartier2015-03-271-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for related libcore change. Bug: 19264997 Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
* | | | | | | | | | Merge "Still more debugging for bug 19823482"Craig Mautner2015-03-292-5/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Still more debugging for bug 19823482Craig Mautner2015-03-292-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a9270ebd0a31c9dc62732b67c640191549d396e
* | | | | | | | | | | Merge "Fixed issue with paused activity still freezing display."Wale Ogunwale2015-03-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fixed issue with paused activity still freezing display.Wale Ogunwale2015-03-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An activity freezes the display when it is relaunched when configuration changes. If the activity takes time to launch and another activity is launched before it is done, the activity that froze the display will be paused and might not have the chance to unfreeze the display. This will put WindowManager in an odd state. We now unfreeze the display when an activity is done pausing in case it was previously freezing the display. Bug: 19823482 Change-Id: If5538aea639e06d0b8621646bf6b2e12d325287a
* | | | | | | | | | | Fix buildSvet Ganov2015-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3fc843ad02ea3a83f03cf1d6b063d4031da51b1
* | | | | | | | | | | Merge "Fix runtime permissinos toggling and relax XML parsing."Svet Ganov2015-03-294-165/+161
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix runtime permissinos toggling and relax XML parsing.Svet Ganov2015-03-284-165/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixed the case where runtime permissons can be toggled by a developer via a system property. 2. Relaxed the runtime permission XML parsing to be more fault toelrant and consistent wiht the reset of the package manager parse code. 3. Fixed a deadlock due to calling in to the activity manager with the package manager lock held to kill an app. Change-Id: I11dfb57ad4d8119baea79227dc2a3fe5e2208515
* | | | | | | | | | | | Merge "Revert "Use AVD for checkbox animation.""Tenghui Zhu2015-03-29175-542/+154
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Use AVD for checkbox animation."Tenghui Zhu2015-03-28175-542/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9734bdc97ee3049cdadfb04fce1fd76626934519. Change-Id: I2736560a7712418b7b69507a82619b9ca8552014
* | | | | | | | | | | | | Merge "Fix a regression in settings parsing"Svet Ganov2015-03-282-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix a regression in settings parsingSvet Ganov2015-03-282-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I222bac482a843112ae031b00c83e3765ea6b456c
* | | | | | | | | | | | | Merge "Make the MIDI Manager optional, enabled by "android.software.midi" ↵Mike Lockwood2015-03-288-12/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature"
| * | | | | | | | | | | | | Make the MIDI Manager optional, enabled by "android.software.midi" featureMike Lockwood2015-03-278-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76d442ea28beea4b9e2876bfef501d8f61403702
* | | | | | | | | | | | | | am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String ↵Andreas Gampe2015-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | == to equals in Preference" * commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754': Frameworks/base: Change String == to equals in Preference
| * | | | | | | | | | | | | am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals ↵Andreas Gampe2015-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Preference" * commit 'd7fb6d26d809775996f70e23213392a3dcf10c8f': Frameworks/base: Change String == to equals in Preference
| | * | | | | | | | | | | | am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"Andreas Gampe2015-03-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7': Frameworks/base: Change String == to equals in Preference
| | | * | | | | | | | | | | Merge "Frameworks/base: Change String == to equals in Preference"Andreas Gampe2015-03-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Frameworks/base: Change String == to equals in PreferenceAndreas Gampe2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19797138 Change-Id: I496b12c425da45ee098db12e72ad843c22444ba3
* | | | | | | | | | | | | | | am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request ↵Andreas Gampe2015-03-281-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removal in VoiceInteractionSession" * commit '1bca3532687675d81dea805b12577a6c3a00b4c3': Frameworks/base: Fix request removal in VoiceInteractionSession
| * | | | | | | | | | | | | | am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in ↵Andreas Gampe2015-03-281-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VoiceInteractionSession" * commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa': Frameworks/base: Fix request removal in VoiceInteractionSession
| | * | | | | | | | | | | | | am 5a15bf69: Merge "Frameworks/base: Fix request removal in ↵Andreas Gampe2015-03-281-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VoiceInteractionSession" * commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc': Frameworks/base: Fix request removal in VoiceInteractionSession
| | | * | | | | | | | | | | | Merge "Frameworks/base: Fix request removal in VoiceInteractionSession"Andreas Gampe2015-03-281-5/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Frameworks/base: Fix request removal in VoiceInteractionSessionAndreas Gampe2015-03-171-5/+1
| | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and simplify removeRequest. Bug: 19797138 Change-Id: I0eca877e3109c9f39cebd4c888f166ce334fcc0e
* | | | | | | | | | | | | | | Merge "Respect the transport's requestFullBackupTime() backoff"Christopher Tate2015-03-281-8/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Respect the transport's requestFullBackupTime() backoffChristopher Tate2015-03-271-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now make sure to pause by at least requestFullBackupTime() between full-data backup operations, to give the transport the ability to apply traffic control while we're running the queue of eligible packages. Also, we now reset a package's queue position whenever a full-data backup for that package is run explicitly via adb. Bug 19732890 Change-Id: I6cf24495ad18eebd55557f229d11c703e5b7f529
* | | | | | | | | | | | | | | | Merge "Relax the parsing code in settings provider."Svet Ganov2015-03-281-63/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Relax the parsing code in settings provider.Svet Ganov2015-03-271-63/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The practice in the system server is to have lenient parsing code to avoid the whole system being unusable due to a single XML error. Change-Id: Idf44031edf5221966f3352ca2f83e284973ab95f
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-28146-0/+1322
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-26 23:28:40 +0000