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

175607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
552f355d45 Import translations. DO NOT MERGE 
Change-Id: Idea8937903353be0a01f0213ef7f4b827e86dbf6
Auto-generated-cl: translation import
 2014-12-01 07:16:21 -08:00
Yohann Roussel
e92f62901b am 8596021c: am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum." 
* commit '8596021c3b51c7e66ed54e7fd904534f3aa5e01c':
  Add tests about annotations and enum.
 2014-12-01 10:15:54 +00:00
Yohann Roussel
8596021c3b am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum." 
* commit '3e5223fd02d0f096ca50c964378c717adbb2e3e9':
  Add tests about annotations and enum.
 2014-12-01 10:12:09 +00:00
Yohann Roussel
3e5223fd02 am 6829daa4: Merge "Add tests about annotations and enum." 
* commit '6829daa44a66333ef869dbcd655eac220c34561b':
  Add tests about annotations and enum.
 2014-12-01 10:05:45 +00:00
Yohann Roussel
6829daa44a Merge "Add tests about annotations and enum." 2014-12-01 09:30:59 +00:00
Michael Wright
6ae2986ad5 am 245da877: am fa910081: am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad" 
* commit '245da877d1cb78f54ed98cc713da95c617ff1769':
  Add keylayout for Logitech RedHawk Gamepad
 2014-12-01 05:33:55 +00:00
Craig Mautner
1d027d6661 am bda8e419: am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released." 
* commit 'bda8e4192a26b5ab137ba3c22ea00b493a1b673e':
  [ActivityManager] Ensure provider external access count will be released.
 2014-12-01 05:33:49 +00:00
Craig Mautner
ad9c287add am 10c40fc0: am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit '10c40fc01d56ee17068cb61d5c19e6ab68f2ca48':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 05:33:43 +00:00
Craig Mautner
8768672e78 am 62404e15: am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '62404e15f9d9935eb42b7cc559e95018b34bc307':
  Fix pointer index out of range exception
 2014-12-01 05:33:37 +00:00
Craig Mautner
8bbcd72c8b am b97f7190: am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'b97f719036b15c81aeb561ae0d2b4da68e7a06e8':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:33:32 +00:00
Craig Mautner
a675838a6c am 5a6c1962: am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '5a6c1962590979d0722da0547a6ba3ae1a98dd04':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-01 05:33:27 +00:00
Michael Wright
245da877d1 am fa910081: am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad" 
* commit 'fa9100814a9139447e91edf9075a9fe55b044345':
  Add keylayout for Logitech RedHawk Gamepad
 2014-12-01 05:27:15 +00:00
Craig Mautner
bda8e4192a am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released." 
* commit 'be342ef034f05c6864aaa85ab25c009148954552':
  [ActivityManager] Ensure provider external access count will be released.
 2014-12-01 05:27:08 +00:00
Craig Mautner
10c40fc01d am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit 'a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 05:27:00 +00:00
Craig Mautner
62404e15f9 am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '6151b118b663b0620fee4fb87d9d143c6fd050b8':
  Fix pointer index out of range exception
 2014-12-01 05:26:53 +00:00
Craig Mautner
b97f719036 am fac55682: am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit 'fac55682148e6d9c6b4e24769369e2b76ab018ac':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 05:26:47 +00:00
Craig Mautner
5a6c196259 am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-01 05:26:37 +00:00
Craig Mautner
3395e39c5d am 0124980e: resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp 
* commit '0124980e9fe2f5d21748254441229820cca6b601':
  Prevent showing immersive confirmation unexpectedly
 2014-12-01 05:21:48 +00:00
Craig Mautner
0124980e9f resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp 
Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
 2014-11-30 21:16:39 -08:00
Michael Wright
fa9100814a am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad" 
* commit '461eaf79a726f5a754f467d7f3dd163aaa463857':
  Add keylayout for Logitech RedHawk Gamepad
 2014-12-01 04:43:34 +00:00
Michael Wright
461eaf79a7 Merge "Add keylayout for Logitech RedHawk Gamepad" 2014-12-01 04:36:25 +00:00
Craig Mautner
be342ef034 am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released." 
* commit 'c4cf78f4d3154af317e686c9ef702a26cf28f8f2':
  [ActivityManager] Ensure provider external access count will be released.
 2014-12-01 00:26:11 +00:00
Craig Mautner
a12ac54cf6 am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit '255963742982daf46eb665a2934bd61e7ed95c81':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 00:22:10 +00:00
Craig Mautner
c4cf78f4d3 Merge "[ActivityManager] Ensure provider external access count will be released." 2014-12-01 00:20:33 +00:00
Craig Mautner
6151b118b6 am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '94ac906b103b0f03eca2000815bf306209f33109':
  Fix pointer index out of range exception
 2014-12-01 00:16:57 +00:00
Craig Mautner
fac5568214 am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed" 
* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
  [ActivityManager] Avoid system server crash due to package removed
 2014-12-01 00:16:52 +00:00
Craig Mautner
2559637429 Merge "[ActivityManager] Prevent provider from been created twice." 2014-12-01 00:16:41 +00:00
Craig Mautner
94ac906b10 Merge "Fix pointer index out of range exception" 2014-12-01 00:13:28 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Craig Mautner
11c67c92de am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '7db48ed03623834f7b8b420c83ab7916f6b39a8a':
  Reset killedByAm flag at attachApplicationLocked
 2014-11-30 23:59:46 +00:00
Craig Mautner
082c0540e9 am 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly" 
* commit '728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
  Prevent showing immersive confirmation unexpectedly
 2014-11-30 23:59:40 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Craig Mautner
728e6c6c17 Merge "Prevent showing immersive confirmation unexpectedly" 2014-11-30 23:54:43 +00:00
Elliott Hughes
d3794d681a am 29e1c36d: am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '29e1c36d4b57854a34c5db43e37282b867bf149b':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:18:51 +00:00
Elliott Hughes
29e1c36d4b am 3afb9f63: am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '3afb9f6378779e6ee355b0b56c47ad7270e2b832':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:11:58 +00:00
Narayan Kamath
24009c1b87 am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'f1459604392dc0416500e149f1bafa11139dcfcc':
  Stop using ErrorStrings for apache.
 2014-11-27 18:09:40 +00:00
Elliott Hughes
3afb9f6378 am 2c53d22b: Merge "Mention ProGuard in the JNI documentation." 
* commit '2c53d22bcc00838125cd70e17915da6ded5d0aca':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:07:00 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
 2014-11-27 18:03:15 +00:00
Elliott Hughes
2c53d22bcc Merge "Mention ProGuard in the JNI documentation." 2014-11-27 18:01:34 +00:00
Narayan Kamath
ed2c9c6029 am 10a36fb7: Merge "Stop using ErrorStrings for apache." 
* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
  Stop using ErrorStrings for apache.
 2014-11-27 17:58:21 +00:00
Narayan Kamath
10a36fb749 Merge "Stop using ErrorStrings for apache." 2014-11-27 17:53:04 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache. 
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
 2014-11-27 17:23:41 +00:00
Ignacio Solla
03c76e2b55 Merge "[WebView] Remove fallback call to WebViewFactoryProvider no-arg constructor." 2014-11-27 15:28:01 +00:00
Narayan Kamath
0f4a1abc39 am d534645b: am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit 'd534645bab608bbee1ec6e9e72d10b88c53c023f':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:15:22 +00:00
Narayan Kamath
d534645bab am bedb1378: am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit 'bedb13782a6beb5f15621915a7b68439c6649ced':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:10:03 +00:00
Narayan Kamath
bedb13782a am 8036d2ec: Merge "Delete general sounding "CharArrayBuffers" class." 
* commit '8036d2ec739636c1913a417cace97a5027d0270d':
  Delete general sounding "CharArrayBuffers" class.
 2014-11-27 14:03:57 +00:00
Narayan Kamath
b8b6e1f8f1 am 5445d3de: am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http." 
* commit '5445d3de90fd28ba8e096a109a242615bb8222d3':
  Delete unused class from android.net.http.
 2014-11-27 14:01:23 +00:00
Olawale Ogunwale
ef68eaa9b1 am 21aadfcf: am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit '21aadfcf71c87b50aa2aff20d0a4e76aebfb9c38':
  Fix bad exclude region in landscape
 2014-11-27 14:01:18 +00:00
Narayan Kamath
8036d2ec73 Merge "Delete general sounding "CharArrayBuffers" class." 2014-11-27 13:57:27 +00:00
Narayan Kamath
5445d3de90 am f0c22b0c: am 14e28134: Merge "Delete unused class from android.net.http." 
* commit 'f0c22b0c72c8fbd5ce507419adda0670871a07bf':
  Delete unused class from android.net.http.
 2014-11-27 13:55:02 +00:00