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

82115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
3666dd8ca9 Merge "Revise and update CellInfo API's" 2012-07-25 14:10:20 -07:00
Wink Saville
b208a24cf5 Revise and update CellInfo API's 
Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
 2012-07-25 14:08:09 -07:00
Ying Wang
f40d5cf3d1 Merge "Import translations. DO NOT MERGE" 2012-07-25 13:53:28 -07:00
Ying Wang
02f5c403ec Import translations. DO NOT MERGE 
Change-Id: I77ba36c634b0f17682c88f7b7d255950fc2906be
Auto-generated-cl: translation import
 2012-07-25 12:33:36 -07:00
Irfan Sheriff
cba4d38820 Merge "Update WifiManager API" 2012-07-25 12:25:13 -07:00
Stephen Hines
325311251e Merge "Test for unsigned RS setters." 2012-07-25 11:46:56 -07:00
Stephen Hines
85dae98ca1 Test for unsigned RS setters. 
BUG=6764163

This verifies that we don't trample memory with our unsigned set_*()
operations. Previous versions of llvm-rs-cc generated code that could
accidentally overwrite neighboring locations (due to setVar() being
called on the larger Dalvik types for unsigned globals).

Change-Id: I014496122a05cf425efa160978d0738a5233742e
 2012-07-25 11:45:28 -07:00
Daniel Sandler
fb5549f64b Merge "Fix NPE." 2012-07-25 11:02:24 -07:00
Daniel Sandler
75fcac4eeb Fix NPE. 
Bug: 6878563
Change-Id: I9a2afed6e2b517c2d6b54cea3d812fb84835fb00
 2012-07-25 13:51:44 -04:00
Mikhail Naganov
500b003ff1 Improve JavaDoc for cache mode constants. 
Bug: 5461416
Change-Id: I26c48a6428ff1afb5346eeaa02c5ca74ec95173c
 2012-07-25 13:06:14 +01:00
Daniel Sandler
9014345dda am 7d1ef0ce: am 3ee47ae7: Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev 
* commit '7d1ef0cee7c61dea18216a80a00d437109b698d5':
  Fix 6804479: "Emergency calls only" in notification shade
 2012-07-24 22:16:20 -07:00
Adam Cohen
c864b54b33 am 355301e9: am 2daf9dc9: Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev 
* commit '355301e9688c2485424e514c290780ff2cd44186':
  Prevent crash in AppWidgetHost that can be triggered by an AppWidget
 2012-07-24 22:16:15 -07:00
Quddus Chong
432f86d126 am 38f849ca: am 4eb6973b: Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 
* commit '38f849ca81394fae6af83dd68c34f7cbf46d5760':
  docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358
 2012-07-24 22:16:10 -07:00
Jake Hamby
278123ca4f am c213246d: am 7b661fb3: (-s ours) Implement CMAS service category program results. 
* commit 'c213246d2541e9b91c298b1b3fd3ba5fd8ac9a93':
  Implement CMAS service category program results.
 2012-07-24 22:16:06 -07:00
Daniel Sandler
7d1ef0cee7 am 3ee47ae7: Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev 
* commit '3ee47ae7ee0d0afc0a2bbe71636c31483b5502cd':
  Fix 6804479: "Emergency calls only" in notification shade
 2012-07-24 22:13:56 -07:00
Adam Cohen
355301e968 am 2daf9dc9: Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev 
* commit '2daf9dc9eb462b8e16e8871a6f4573cded1e3fa6':
  Prevent crash in AppWidgetHost that can be triggered by an AppWidget
 2012-07-24 22:13:52 -07:00
Quddus Chong
38f849ca81 am 4eb6973b: Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 
* commit '4eb6973bc1f8cd51a2466708b227fb51314ad0c1':
  docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358
 2012-07-24 22:13:46 -07:00
Jake Hamby
c213246d25 am 7b661fb3: (-s ours) Implement CMAS service category program results. 
* commit '7b661fb3fc17f981bb122520791344891a3c1661':
  Implement CMAS service category program results.
 2012-07-24 22:13:42 -07:00
Shawn Pearce
29f78363d1 am 5f8d4832: am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev 
* commit '5f8d48324e891fa9953ffa3056ea9d8f03075d96':
  Fix 5608959: Make keyguard follow user setting for orientation
 2012-07-24 22:11:26 -07:00
Scott Main
113f8745c7 am f5746984: am 0804b6db: docs: specify that adt v20 or higher is required for class 
* commit 'f574698404bf3f5aeeb2665ae53f165d629e6951':
  docs: specify that adt v20 or higher is required for class
 2012-07-24 22:11:19 -07:00
Shawn Pearce
5f8d48324e am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev 
* commit '8d6ff012ed14fb2e0ddad059deea3b1fe74aac3c':
  Fix 5608959: Make keyguard follow user setting for orientation
 2012-07-24 22:08:57 -07:00
Scott Main
f574698404 am 0804b6db: docs: specify that adt v20 or higher is required for class 
* commit '0804b6dbf557df6d69f96c18ebd638ee74c7c050':
  docs: specify that adt v20 or higher is required for class
 2012-07-24 22:08:52 -07:00
Joe Fernandez
84ed76b63a am c7f59ec1: am 156671ef: Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev 
* commit 'c7f59ec1a1e962f7672467ac963006921bb18f62':
  docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
 2012-07-24 22:03:37 -07:00
Dianne Hackborn
b497a819b7 am f52dcf32: am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev 
* commit 'f52dcf32f2fba7c89bbd127c22f2ee2b933915c6':
  Fix issue #6860828 Non-root shell can't grant permissions
 2012-07-24 22:03:33 -07:00
Scott Main
576238a331 am 6ce3887a: am 707e6321: Merge "typo fix" into jb-dev 
* commit '6ce3887a62e99586172af7aec8ea54a71e56e634':
  typo fix
 2012-07-24 22:03:28 -07:00
Joe Fernandez
63ac83ac39 am 881a2f66: am 614b7307: Merge "doc: fix for NDK r8b release notes" into jb-dev 
* commit '881a2f6676720cdbba7146748420aacfaca3cbfb':
  doc: fix for NDK r8b release notes
 2012-07-24 22:03:23 -07:00
Michael Chan
5f0a47415c am 19a04862: am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev 
* commit '19a048626e29524e17bbe30f1f235aa365b6212b':
  Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.
 2012-07-24 22:03:18 -07:00
Wink Saville
d8eee690f4 am 46653c2f: am bc8bab89: (-s ours) Merge "Don\'t send terminal response without cmd details." into jb-dev 
* commit '46653c2fa07fa4d120d5fb2215be70d436da894d':
  Don't send terminal response without cmd details.
 2012-07-24 22:03:13 -07:00
Joe Fernandez
c7f59ec1a1 am 156671ef: Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev 
* commit '156671ef9a6581b6790bb17bfda8a9efcf9f0693':
  docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
 2012-07-24 22:01:00 -07:00
Dianne Hackborn
f52dcf32f2 am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev 
* commit 'da9754e883cd7b738da9cc6ec4bb1c5b6c5b8d93':
  Fix issue #6860828 Non-root shell can't grant permissions
 2012-07-24 22:00:56 -07:00
Scott Main
6ce3887a62 am 707e6321: Merge "typo fix" into jb-dev 
* commit '707e6321fd1dbff33e6fa3437fdce4eeaa3e1168':
  typo fix
 2012-07-24 22:00:49 -07:00
Joe Fernandez
881a2f6676 am 614b7307: Merge "doc: fix for NDK r8b release notes" into jb-dev 
* commit '614b7307c771db7a6328a55b14983c34554440be':
  doc: fix for NDK r8b release notes
 2012-07-24 22:00:45 -07:00
Michael Chan
19a048626e am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev 
* commit 'a13730f42449d97ec7206769ccaad9d95bc2924f':
  Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.
 2012-07-24 22:00:39 -07:00
Wink Saville
46653c2fa0 am bc8bab89: (-s ours) Merge "Don\'t send terminal response without cmd details." into jb-dev 
* commit 'bc8bab8949e3ab1ccfff5b5b96ed3726cfa938bb':
  Don't send terminal response without cmd details.
 2012-07-24 22:00:35 -07:00
Daniel Sandler
3ee47ae7ee Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev 2012-07-24 20:30:26 -07:00
Adam Cohen
2daf9dc9eb Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev 2012-07-24 19:17:19 -07:00
Dake Gu
3939f78482 am 4d716708: (-s ours) Merge "synchronized audio beat detection: DO NOT MERGE" into ics-aah 
* commit '4d7167086dfeb8ea44cba9107f058797e0bedd2d':
  synchronized audio beat detection: DO NOT MERGE
 2012-07-24 19:16:55 -07:00
Dake Gu
4d7167086d Merge "synchronized audio beat detection: DO NOT MERGE" into ics-aah 2012-07-24 19:15:06 -07:00
Quddus Chong
4eb6973bc1 Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev 2012-07-24 17:59:11 -07:00
Quddus Chong
375d72baa7 docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 
Bug: 5942358

Change-Id: Ib15f96f267aa0a713fbd03b3bf5dced8c37da12e
 2012-07-24 17:44:55 -07:00
Daniel Sandler
0ae29275b8 Fix 6804479: "Emergency calls only" in notification shade 
Add an additional codepath to the "no connectivity" logic in
NetworkController to allow the PLMN bubble up from the
GsmServiceStateTracker, where R.string.emergency_calls_only
is returned if we're in emergency call mode.

Bug: 6804479
Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
 2012-07-24 20:41:31 -04:00
Fabrice Di Meglio
e4f6a3351b Merge "Fix layout as there was a regression introduced in a previous CL" 2012-07-24 17:39:04 -07:00
Jake Hamby
7b661fb3fc Implement CMAS service category program results. 
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
 2012-07-24 17:31:05 -07:00
Shawn Pearce
8d6ff012ed Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev 2012-07-24 17:23:38 -07:00
Ed Heyl
2624c3adbe Merge "Account for static child transformations correctly" 2012-07-24 17:21:56 -07:00
Romain Guy
63cf075222 Merge "Make HardwareRenderer able to target generic Surface objects" 2012-07-24 17:21:56 -07:00
Jim Miller
f33efd9c06 Merge "Fix 6847667: remove custom layout for 720dp device" 2012-07-24 17:21:56 -07:00
Fabrice Di Meglio
b8a3942527 Merge "Introduce listPreferredItemPaddingStart/listPreferredItemPaddingEnd" 2012-07-24 17:21:56 -07:00
Shawn Pearce
4725fbe6df Merge "Clean up info and callback architecture in KeyguardUpdateMonitor." 2012-07-24 17:21:56 -07:00
Fabrice Di Meglio
04bf7bbbf6 Fix layout as there was a regression introduced in a previous CL 
- revert to the previous layout
- see https://googleplex-android-review.googlesource.com/#/c/182330/3

Change-Id: I854038547d845280bb3e1dadfe68eea4192635e4
 2012-07-24 17:03:25 -07:00