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

48289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
3b71239aca Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 2011-06-03 14:01:59 -07:00
Kazuhiro Ondo
77c9411306 Data recovery failure due to apn/dc state stuck in "disconnecting" 
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.

This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
   to ensure DC won't be stuck in DcDisconnectingState so force
   reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
   can be reset to IDLE even if no reference to DCAC.

Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
 2011-06-03 11:42:48 -07:00
Daniel Sandler
f5699b82ad am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:22:49 -07:00
Daniel Sandler
b4b44bd329 DO NOT MERGE. Restore status bar on phones. 
Bug: 4529373
Change-Id: Ie08522dbf762e80ac077ce403ff83312cec907f7
 2011-06-03 11:11:10 -07:00
Gilles Debunne
00afa11c15 am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:32:00 -07:00
Andy Stadler
c22d145a9f am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 10:28:45 -07:00
Gilles Debunne
0538e6217d Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 2011-06-03 10:26:18 -07:00
Andy Stadler
3148557c42 Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 2011-06-03 10:24:27 -07:00
Wink Saville
5b4e24400a Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 2011-06-03 10:16:11 -07:00
Robert Greenwalt
352dbc44a4 Promote Telephony's isDataPossible. 
bug:3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
 2011-06-03 09:51:03 -07:00
Wink Saville
db09b5db60 Refactor ServiceStateTracker handling of radio technology. 
Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
 2011-06-03 09:06:28 -07:00
satok
e10de072d5 am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:22:35 -07:00
satok
be96408b80 (Do not merge) Backport a fix for InputMethodManager.java 
Bug: 4517456

Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5

Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e
 2011-06-03 14:48:21 +09:00
Dianne Hackborn
758b67b123 am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:30:34 -07:00
Dianne Hackborn
b46ed7636b Add new Fragment API for explicitly saving/restoring state. 
Also fix issue #4519821:
Blank screen displayed on tapping "Battery Use" option in the settings

We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.

And fix a fragment problem where we still weren't correctly restoring
the state of list views.  (I think this was from a bad manual-merge
from master.)

Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
 2011-06-02 19:18:07 -07:00
Wink Saville
2e543dc188 Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 2011-06-02 18:21:50 -07:00
Wink Saville
1076f5ff27 Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 2011-06-02 18:21:37 -07:00
John Wang
98c7781ca8 Add supplyPuk to do SIM puk unlock. 
Change-Id: I48654091ac3133a0c405448871b0a2f1ed3ded4b
 2011-06-02 17:49:49 -07:00
Jeff Brown
c881276160 am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
  Add a preference panel for mouse speed.
 2011-06-02 17:28:07 -07:00
Jeff Brown
8186a5f065 am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '10c3f367a3eb66081c06f1d75107d26e64ce248f':
  Implement pointer acceleration.
 2011-06-02 17:27:48 -07:00
Jeff Brown
e1718de61c Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:05 -07:00
Jeff Brown
10c3f367a3 Merge "Implement pointer acceleration." into honeycomb-mr2 2011-06-02 17:25:59 -07:00
Gilles Debunne
793a940b84 Tap timeout removed on paste. Relying on position only. 
Change-Id: I2e2b4a68f17957a2631a545badd602e4d127cfc3
 2011-06-02 16:55:15 -07:00
Andy Stadler
237574444b DO NOT MERGE Use unchecked admin lookup for getStorageEncryption() 
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin.  This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.

This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.

Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9

Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
 2011-06-02 16:37:39 -07:00
Jeff Brown
1a84fd1fb7 Add a preference panel for mouse speed. 
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
 2011-06-02 15:39:21 -07:00
Jeff Brown
19c97d46fb Implement pointer acceleration. 
Bug: 4124987
Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
 2011-06-02 14:12:05 -07:00
Kazuhiro Ondo
c46a085eed Read CSIM records in LTE on CDMA mode 
In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.

Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
 2011-06-02 14:04:24 -07:00
Kazuhiro Ondo
c91c7f92c9 CdmaLte: Use SPN from SIM card if SIM card is presend 
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
 2011-06-02 13:58:11 -07:00
Scott Main
5b8342cf19 am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2 
* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d':
  cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
 2011-06-02 10:01:53 -07:00
Scott Main
d5335253cb am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 
* commit 'b82367512177999e240bb35ededcae20dd1e14ee':
  cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
 2011-06-02 10:01:51 -07:00
Scott Main
b04ac7ac0b am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 
* commit '0d5ed597b7b2a91d6a97d188df37caef039242af':
  Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
 2011-06-02 10:01:42 -07:00
Scott Main
a86290891a Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2 2011-06-02 09:52:09 -07:00
Scott Main
99960b73e9 cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e 
docs: add 'animator' resource info

Change-Id: Ifbd130e5bf762d89300c20db0d86d7f695b4ff4b
 2011-06-02 09:51:23 -07:00
Scott Main
b823675121 Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 2011-06-02 09:49:43 -07:00
Scott Main
25d0b9f3a0 cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 
docs: release notes for adt 11

Change-Id: I9041a5e34fcf34e8a08b3e9becc8c149f773a250
 2011-06-02 09:48:24 -07:00
Scott Main
0d5ed597b7 Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 2011-06-02 09:47:31 -07:00
Scott Main
8f0d336c4d Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b 
docs: fix broken links

Change-Id: Ibc71e21b6024a8bed0fc07dba5e0a9c6c5d7f8c0
 2011-06-02 09:45:53 -07:00
Dianne Hackborn
a5f8851019 am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2 
* commit '2969b51132b80c873663aa2472b21d3e95845927':
  Add new supports-screen API to set maximum allowed size.
 2011-06-01 22:31:26 -07:00
Dianne Hackborn
2969b51132 Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2 2011-06-01 22:28:56 -07:00
Dianne Hackborn
2762ff3dc8 Add new supports-screen API to set maximum allowed size. 
Change-Id: I0a7cd4ba73a4c18558e6daee28963d5fd12c7978
 2011-06-01 22:20:38 -07:00
Scott Main
ce214df999 am f58e6c98: Merge "doc typo" into honeycomb-mr2 
* commit 'f58e6c982267e6e027b8a286ebe2a2e349348ee7':
  doc typo
 2011-06-01 18:29:54 -07:00
Dianne Hackborn
8b9a2b6cbd am e6676351: Work around OpenFeint bug. 
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
  Work around OpenFeint bug.
 2011-06-01 18:29:50 -07:00
Scott Main
f58e6c9822 Merge "doc typo" into honeycomb-mr2 2011-06-01 18:19:12 -07:00
Dianne Hackborn
e66763516a Work around OpenFeint bug. 
Change-Id: Ib8320e50bb63fc56dc0118d5c8e9e328dbd3fcb1
 2011-06-01 16:52:36 -07:00
Scott Main
f9e43b8cba doc typo 
Change-Id: Iab3246e12059582096594eb795f2eb42da46f667
 2011-06-01 16:28:19 -07:00
Adam Powell
036c40f443 am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
  Framework: bugfix for menu selector not showing up properly.
 2011-06-01 12:49:47 -07:00
Adam Powell
fa8ee17702 Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 2011-06-01 12:48:03 -07:00
Dianne Hackborn
7cae137ed1 am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
  Compatibility mode never needed for normal size screens.
 2011-06-01 12:47:29 -07:00
Dianne Hackborn
79841acb62 Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 2011-06-01 12:43:56 -07:00
Dianne Hackborn
39ec8fb957 Compatibility mode never needed for normal size screens. 
Change-Id: I3482fa692618b9272e1e19384e766a77f2a53c5d
 2011-06-01 12:42:55 -07:00