Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,639 Commits 3 Branches 0 Tags
bcfc52540692fa11dfc8fb0fe394eafec21cf2f2
Commit Graph

169639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
bcfc525406 am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'de3f61f46616ed42c03fc8f171324e011ddbcc5d':
  Import translations. DO NOT MERGE
 2014-12-01 19:32:36 +00:00
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
smain@google.com
183d9e4a75 am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'b8de593ec2ca04009835960357c59feff28af551':
  define height for context images to avoid content jumps on load
 2014-12-01 19:32:25 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +00:00
Craig Mautner
1764465d81 am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit 'b5981aa8d18dbd952ff74a75f962d4ec98f38807':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:49:34 +00:00
Craig Mautner
b5981aa8d1 am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit 'ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:44:24 +00:00
Craig Mautner
ee7c30e1f9 Merge "Avoid capture all black screenshot bitmap" 2014-12-01 16:38:14 +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
tingna_sung
e3ca048397 Avoid capture all black screenshot bitmap 
Captured screenshot bitmap is all black one if none of windows is
surface shown.

Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-12-01 15:22:43 +08: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
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
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
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
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
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
Olawale Ogunwale
21aadfcf71 am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit 'f586072861850ade660e11eafa799f96314ce475':
  Fix bad exclude region in landscape
 2014-11-27 13:54:37 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class. 
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
 2014-11-27 13:52:11 +00:00
Narayan Kamath
f0c22b0c72 am 14e28134: Merge "Delete unused class from android.net.http." 
* commit '14e28134c445435d71ed754e6be5867655d1dda3':
  Delete unused class from android.net.http.
 2014-11-27 13:03:34 +00:00
Narayan Kamath
14e28134c4 Merge "Delete unused class from android.net.http." 2014-11-27 12:58:33 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http. 
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
 2014-11-27 12:52:48 +00:00
Craig Mautner
205dc8f94c am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '980ce4bad08f65e559c39e86e799389c6615297e':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-27 12:01:33 +00:00