drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
186,442 Commits 1 Branch 0 Tags
Commit Graph

186442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etan Cohen
eb864d4000 Merge commit 'd91f193' into merge2 2015-04-01 09:31:43 -07:00
Etan Cohen
227542a3d1 Merge commit '5718646' into merge2 2015-04-01 09:31:20 -07:00
Etan Cohen
41dc421322 Merge commit '7aa0345' into merge2 2015-04-01 09:31:04 -07:00
Alan Viverette
523fe91af4 Merge "Clean up time picker attributes and drawing code" 2015-03-30 17:27:03 +00:00
Mike Lockwood
e9e02d5235 Merge "Move MIDI utilities for internal use to com.android.internal.midi package" 2015-03-30 17:26:03 +00:00
Mike Lockwood
d1b16fe2fb Move MIDI utilities for internal use to com.android.internal.midi package 
Change-Id: I7393ae1d4bca61667fb6ee809a7aa22c5c48de56
 2015-03-30 09:06:06 -07:00
Geoff Mendal
27e3514e55 am b64b7885: (-s ours) am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE 
* commit 'b64b78856cf6121e9956f8910f30656ebde5d024':
  Import translations. DO NOT MERGE
 2015-03-30 15:03:29 +00:00
Geoff Mendal
b64b78856c am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE 
* commit '6e22b3293298b721815b321b503cbe4ce34ae77d':
  Import translations. DO NOT MERGE
 2015-03-30 14:56:54 +00:00
Geoff Mendal
20ec48bd00 am e9669588: (-s ours) Import translations. DO NOT MERGE 
* commit 'e9669588c22eeae992e6b6d237f311856e4886c2':
  Import translations. DO NOT MERGE
 2015-03-30 14:56:24 +00:00
Geoff Mendal
6e22b32932 am 6e6250b9: (-s ours) Import translations. DO NOT MERGE 
* commit '6e6250b9613e7c236a07367fc800feece8bcd706':
  Import translations. DO NOT MERGE
 2015-03-30 14:49:09 +00:00
Geoff Mendal
e9669588c2 Import translations. DO NOT MERGE 
Change-Id: I451a8edb373ffeeddb1d05d6e5c15ff35d4c9109
Auto-generated-cl: translation import
 2015-03-30 07:47:39 -07:00
Geoff Mendal
6e6250b961 Import translations. DO NOT MERGE 
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
 2015-03-30 07:38:42 -07:00
Geoff Mendal
a21e7663c2 Merge "Import translations. DO NOT MERGE" 2015-03-30 14:36:27 +00:00
Geoff Mendal
d64ee3085f Import translations. DO NOT MERGE 
Change-Id: I401a825e79422050bc39fff0b7c8998354082478
Auto-generated-cl: translation import
 2015-03-30 07:29:48 -07:00
Geoff Mendal
3622c20f79 Import translations. DO NOT MERGE 
Change-Id: I33c678add2505ec35670928d3e0c0c9751c66bda
Auto-generated-cl: translation import
 2015-03-30 05:50:27 -07:00
Clara Bayarri
dff34599c2 Merge "Editor: Cleanup the unused ActionPopupWindow" 2015-03-30 08:59:11 +00:00
Jinsuk Kim
c45fd20f55 Merge "CEC: Do not send <ARC Terminated> when init request gets rejected" 2015-03-30 05:07:17 +00:00
Mathieu Chartier
f37c099c70 am 2169c68a: am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit '2169c68aa330670ab340ec7faaedb5e5a9a59360':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-30 00:36:51 +00:00
Mathieu Chartier
2169c68aa3 am d9dddea5: am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit 'd9dddea504d717120eaa5e9c15fe484e26511e92':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-30 00:26:46 +00:00
Craig Mautner
8501866d74 Merge "Still more debugging for bug 19823482" 2015-03-29 23:50:00 +00:00
Mathieu Chartier
d9dddea504 am 631565ab: Merge "Change getDeclaredFieldsUnchecked call to new return value" 
* commit '631565abd6cadd65befe197afa7bac0d44f70fb2':
  Change getDeclaredFieldsUnchecked call to new return value
 2015-03-29 22:42:53 +00:00
Jinsuk Kim
71651d3712 CEC: Do not send <ARC Terminated> when init request gets rejected 
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
 2015-03-30 07:31:10 +09:00
Mathieu Chartier
631565abd6 Merge "Change getDeclaredFieldsUnchecked call to new return value" 2015-03-29 22:30:41 +00:00
Wale Ogunwale
ebf750bc9b Merge "Fixed issue with paused activity still freezing display." 2015-03-29 19:21:50 +00:00
Wale Ogunwale
07927bffa7 Fixed issue with paused activity still freezing display. 
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
 2015-03-29 09:55:21 -07:00
Craig Mautner
7258118c06 Still more debugging for bug 19823482 
Change-Id: I2a9270ebd0a31c9dc62732b67c640191549d396e
 2015-03-29 09:43:22 -07:00
Svet Ganov
fc2d615a7b Fix build 
Change-Id: Ib3fc843ad02ea3a83f03cf1d6b063d4031da51b1
 2015-03-28 21:08:44 -07:00
Svet Ganov
4bc3d5c4cd Merge "Fix runtime permissinos toggling and relax XML parsing." 2015-03-29 03:16:27 +00:00
Svet Ganov
12a692a5e8 Fix runtime permissinos toggling and relax XML parsing. 
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
 2015-03-28 20:14:58 -07:00
Tenghui Zhu
0783ba669c Merge "Revert "Use AVD for checkbox animation."" 2015-03-29 00:01:27 +00:00
Tenghui Zhu
c243221435 Revert "Use AVD for checkbox animation." 
This reverts commit 9734bdc97ee3049cdadfb04fce1fd76626934519.

Change-Id: I2736560a7712418b7b69507a82619b9ca8552014
 2015-03-28 23:27:12 +00:00
Svet Ganov
0cd50c518b Merge "Fix a regression in settings parsing" 2015-03-28 20:23:12 +00:00
Svet Ganov
c9755bc4f2 Fix a regression in settings parsing 
Change-Id: I222bac482a843112ae031b00c83e3765ea6b456c
 2015-03-28 13:21:22 -07:00
Mike Lockwood
549a8cb66d Merge "Make the MIDI Manager optional, enabled by "android.software.midi" feature" 2015-03-28 16:00:21 +00:00
Andreas Gampe
822b403b68 am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:18:14 +00:00
Andreas Gampe
2d3455993e am 1bca3532: am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '1bca3532687675d81dea805b12577a6c3a00b4c3':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:18:03 +00:00
Andreas Gampe
3fa46a0f79 am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit 'd7fb6d26d809775996f70e23213392a3dcf10c8f':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:11:07 +00:00
Andreas Gampe
1bca353268 am 0e6b4da5: am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '0e6b4da5ca53d338f351827f7a351edcd6281aaa':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:11:02 +00:00
Andreas Gampe
d7fb6d26d8 am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference" 
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
  Frameworks/base: Change String == to equals in Preference
 2015-03-28 05:03:25 +00:00
Andreas Gampe
0e6b4da5ca am 5a15bf69: Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 
* commit '5a15bf69d8d2782d70c462f7fd8bd75e687260dc':
  Frameworks/base: Fix request removal in VoiceInteractionSession
 2015-03-28 05:03:18 +00:00
Andreas Gampe
a01250c774 Merge "Frameworks/base: Change String == to equals in Preference" 2015-03-28 04:50:44 +00:00
Andreas Gampe
5a15bf69d8 Merge "Frameworks/base: Fix request removal in VoiceInteractionSession" 2015-03-28 04:50:08 +00:00
Mathieu Chartier
3d529c5b0a Change getDeclaredFieldsUnchecked call to new return value 
Required for related libcore change.

Bug: 19264997
Change-Id: I17ca0cf4b9ba853e59f4a6eff3a05d9d90cf23f9
 2015-03-27 18:55:50 -07:00
Christopher Tate
c5071f9bf1 Merge "Respect the transport's requestFullBackupTime() backoff" 2015-03-28 01:47:53 +00:00
Svet Ganov
a6439218d6 Merge "Relax the parsing code in settings provider." 2015-03-28 00:59:36 +00:00
Svet Ganov
8440ca3934 Relax the parsing code in settings provider. 
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
 2015-03-27 17:58:40 -07:00
Christopher Tate
a7f038c9c3 Respect the transport's requestFullBackupTime() backoff 
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
 2015-03-27 17:58:18 -07:00
Geoff Mendal
f915585227 Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:57 +00:00
Geoff Mendal
39c78602fb Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:37 +00:00
Geoff Mendal
897c65dbf8 Merge "Import translations. DO NOT MERGE" 2015-03-28 00:12:14 +00:00