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

93073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
803db1646a am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played." 
* commit 'aeb6268645d571dfc9f2d387a7ad2471039ddb54':
  Fallback to fallbackring if ringtone can't be played.
 2012-11-16 13:03:33 -08:00
Marco Nelissen
aeb6268645 Merge "Fallback to fallbackring if ringtone can't be played." 2012-11-16 11:48:14 -08:00
Amith Yamasani
8f97174a9c am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit '4ad8a4bd89c0a93705864e9beda39065b34545d6':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:50:29 -08:00
Amith Yamasani
4ad8a4bd89 am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:47:11 -08:00
Amith Yamasani
acddb72c58 Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 2012-11-16 10:43:48 -08:00
Scott Main
3ed08b1e03 am a1095620: am 159cdd92: am 33e499ea: docs: move articles into group directory 
* commit 'a10956203cd118b95c5f9d81b47ee176f53ba3a6':
  docs: move articles into group directory
 2012-11-16 09:58:44 -08:00
Scott Main
a10956203c am 159cdd92: am 33e499ea: docs: move articles into group directory 
* commit '159cdd925db2cf6d5b2d4cdaa718c1d537ac4fcd':
  docs: move articles into group directory
 2012-11-16 09:56:21 -08:00
Scott Main
159cdd925d am 33e499ea: docs: move articles into group directory 
* commit '33e499ea364e4e061964bc8fe16365fd632eb39d':
  docs: move articles into group directory
 2012-11-16 09:52:27 -08:00
Scott Main
33e499ea36 docs: move articles into group directory 
Change-Id: If90f5ac284d8df16b830d5744fbd684e5b1b34e3
 2012-11-16 08:54:27 -08:00
Oscar Rydhé
1c25a21ffc Fallback to fallbackring if ringtone can't be played. 
If the specified ringtone file exists but cannot be played
the Ringtone will try to play the ringtone in a remote player.
But since the file is corrupt it will not be played in the
remote player either.
According to the documentation it should attempt to
fallback on another sound. This commit will do that.

Change-Id: I0216d61ca874eef0f168ad4d5bfb07491e01e654
 2012-11-16 14:22:14 +01:00
Scott Main
0584c5585c am f428b4dd: am e3ac5321: am fa1320e6: docs: revise getting started intro 
* commit 'f428b4dd90c96574c493a106907115418fb083f9':
  docs: revise getting started intro
 2012-11-15 18:39:14 -08:00
Scott Main
f428b4dd90 am e3ac5321: am fa1320e6: docs: revise getting started intro 
* commit 'e3ac532115f51513fe86ab29e1f76734ece6809b':
  docs: revise getting started intro
 2012-11-15 18:36:30 -08:00
Scott Main
e3ac532115 am fa1320e6: docs: revise getting started intro 
* commit 'fa1320e6148285b2125369fcd5799331132b0eba':
  docs: revise getting started intro
 2012-11-15 18:33:30 -08:00
Scott Main
fa1320e614 docs: revise getting started intro 
Change-Id: I7561da6ae2f21e31370f5dbbd121f2c6084523c1
 2012-11-15 18:30:17 -08:00
Scott Main
6ef004a3b5 am 4b6eb950: am 4c7a5d6a: am 4e2e9bae: docs: update checksums/sizes for new adt bundles 
* commit '4b6eb950bf7e96b7d4134a700814344cbb96c164':
  docs: update checksums/sizes for new adt bundles
 2012-11-15 17:17:31 -08:00
Scott Main
4b6eb950bf am 4c7a5d6a: am 4e2e9bae: docs: update checksums/sizes for new adt bundles 
* commit '4c7a5d6a453512ec29c402530231dbdda5cf5f22':
  docs: update checksums/sizes for new adt bundles
 2012-11-15 17:15:06 -08:00
Scott Main
4c7a5d6a45 am 4e2e9bae: docs: update checksums/sizes for new adt bundles 
* commit '4e2e9bae4082dffa8c59ee10204fd265dfb896bc':
  docs: update checksums/sizes for new adt bundles
 2012-11-15 17:11:44 -08:00
Scott Main
4e2e9bae40 docs: update checksums/sizes for new adt bundles 
Change-Id: Id1245a9f1ce7cf4854e8f39a9938b00aa18e4cca
 2012-11-15 17:09:19 -08:00
Scott Main
b6ef1640ca am fb4d6af6: am 4f784509: am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 
* commit 'fb4d6af6acab1088b667b74da8b24b0cdbc33505':
  docs: update sdk install to handle both 32 and 64-bit bundles
 2012-11-15 15:27:51 -08:00
Scott Main
fb4d6af6ac am 4f784509: am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 
* commit '4f784509f75383c90a91148640cb156bc61e57ee':
  docs: update sdk install to handle both 32 and 64-bit bundles
 2012-11-15 15:25:13 -08:00
Scott Main
4f784509f7 am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 
* commit 'd4ff824915e1c9ea1c3122b5745973f681915279':
  docs: update sdk install to handle both 32 and 64-bit bundles
 2012-11-15 15:22:31 -08:00
Scott Main
d4ff824915 Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev 2012-11-15 15:19:11 -08:00
Adam Cohen
a2d250791d am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '5a0f5ba269c12889246acbbe546ef75285231430':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 15:02:16 -08:00
Adam Cohen
5a0f5ba269 am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '6189888a2565b6362b0dd022850b748f628500d0':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
 2012-11-15 14:59:33 -08:00
Scott Main
49ba8eb06b docs: update sdk install to handle both 32 and 64-bit bundles 
Change-Id: I171f28a332c4d31600865f6ad8f6a95fb4f0c3aa
 2012-11-15 14:56:52 -08:00
Adam Cohen
6189888a25 Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-15 14:56:19 -08:00
Adam Cohen
3fcc6b26c3 Making sure launcher doesn't show keyguard-only widgets (issue 7550090) 
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
 2012-11-15 14:53:31 -08:00
Amith Yamasani
bc9625059b Make sure that the owner user is marked initialized. 
This is required for upgrades from previous versions of JB.

Bug: 7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
 2012-11-15 14:43:13 -08:00
Adam Cohen
af958dce34 am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b82ee0c7bb7fc3ef61e0c31193641e87aecddfe6':
  Pushing state persistence to a background thread
 2012-11-15 13:59:25 -08:00
Adam Cohen
b82ee0c7bb am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b02eb4bb7d09a19aedb9dbc08b0f731af05a8579':
  Pushing state persistence to a background thread
 2012-11-15 13:55:45 -08:00
Adam Cohen
b02eb4bb7d Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 2012-11-15 13:53:53 -08:00
Adam Cohen
a1a2f967e2 Pushing state persistence to a background thread 
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
 2012-11-15 13:44:34 -08:00
Fabrice Di Meglio
e054ab8538 am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '348cf60dbb1de980aa97e551817765e7b3fa0221':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:27:03 -08:00
Fabrice Di Meglio
348cf60dbb am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 
* commit '674a131cb625a7aae0c6e50a24a968200c71b566':
  Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
 2012-11-15 12:23:53 -08:00
Fabrice Di Meglio
674a131cb6 Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 2012-11-15 12:21:00 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
 2012-11-15 11:56:19 -08:00
Jeff Sharkey
9f43afad9d am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '68363456c1f360c0f1afe637a1f3028519e059ed':
  Utility to format human-friendly durations.
 2012-11-15 11:54:43 -08:00
Jeff Sharkey
91b5729323 am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit '64f369a542952a8ac0d22d7d6c4c793a29ebfc52':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:54:38 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
9077ca586e am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit 'dcb72dbb39227674e4a54167efabcdc8add4548a':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:51:49 -08:00
Jeff Sharkey
f838eb40e8 am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'fa0fb7c508dfa4275389a52b7c7907d2032f4aaa':
  Reduce verbosity of service event logging.
 2012-11-15 11:51:45 -08:00
Jeff Sharkey
68363456c1 am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 
* commit '7420ab681eaad22f4b8f884e12d3b2ce82cd203a':
  Utility to format human-friendly durations.
 2012-11-15 11:51:38 -08:00
Jeff Sharkey
64f369a542 am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
dcb72dbb39 am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 
* commit '445767c14ceb51d2839a7bc818c68c81ee7d80a7':
  Watch for leaked ParcelFileDescriptors.
 2012-11-15 11:47:43 -08:00
Jeff Sharkey
fa0fb7c508 am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
  Reduce verbosity of service event logging.
 2012-11-15 11:47:40 -08:00
Jeff Sharkey
7420ab681e Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 2012-11-15 11:47:36 -08:00
Jeff Sharkey
a319d655e3 Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 2012-11-15 11:46:19 -08:00
Jeff Sharkey
445767c14c Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 2012-11-15 11:45:23 -08:00
Jeff Sharkey
f6ba84b424 Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 2012-11-15 11:44:13 -08:00