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

80254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
1971df5d42 am e20a19cb: Merge "show 3G icon for CDMA/1xRTT" 
* commit 'e20a19cb541f8621f04be0f3d3501f2fc51a0e82':
  show 3G icon for CDMA/1xRTT
 2012-08-04 08:07:49 -07:00
Wink Saville
98853623bc Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 2012-08-04 07:54:35 -07:00
Wink Saville
e20a19cb54 Merge "show 3G icon for CDMA/1xRTT" 2012-08-04 07:51:27 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony 
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
 2012-08-03 16:47:51 -07:00
The Android Open Source Project
633233bc9e Reconcile with jb-release - do not merge 
Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab
 2012-08-03 13:23:27 -07:00
The Android Open Source Project
0e51c94c98 Reconcile AOSP and GOOG jb-release 
Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
 2012-08-03 12:11:54 -07:00
Daniel Sandler
4b9a8d75b8 Fix NPE on some phones at startup. 
Bug: 6877589
Change-Id: I65ff37b4cf6b59a72a7aa665f252f5fb34f3b183
 2012-08-03 11:28:10 -07:00
Daniel Sandler
ef5d261191 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-08-03 11:28:04 -07:00
Jake Hamby
715da0ea91 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-08-03 11:27:59 -07:00
Jake Hamby
f8563f5108 Fix detection of CDMA cell broadcast messages. 
The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.

Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
 2012-08-03 11:27:49 -07:00
Robert Greenwalt
a3ed3b62d1 Fix our interpretation of apn setting's bearer. 
Between ICS and JB we changed it to use TelephonyManager's network type
enumeration.  This changes it back to represent the RIL's radio
technology.  The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
 2012-08-03 11:27:44 -07:00
Madan Ankapura
68cad3a0fa show 3G icon for CDMA/1xRTT 
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
 2012-08-02 19:10:22 -07:00
Robert Greenwalt
2cb7db116f resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp 
Change-Id: I7232528f0f438ce9cf7759643631a250f545306e
 2012-08-02 17:15:43 -07:00
Robert Greenwalt
41508f0544 Fix a logging NPE problem 
bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
 2012-08-02 16:06:56 -07:00
Svetoslav Ganov
e1c47324fc am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev 
* commit '9a59f6e02fdcabbf2debd5b836b01f7b22a4b21a':
  Notification panel on tablet does not handle back and home key events.
 2012-08-02 15:19:03 -07:00
Svetoslav Ganov
9a59f6e02f Merge "Notification panel on tablet does not handle back and home key events." into jb-dev 2012-08-02 15:16:03 -07:00
Dirk Dougherty
265eea82ae am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev 
* commit '568db47b770cbfaacdd54914540923258cd6f847':
  Doc change: add trademarks attribution.
 2012-08-02 14:57:50 -07:00
Svetoslav Ganov
73b9c29b8b Notification panel on tablet does not handle back and home key events. 
1. Notification panel on tablet does not handle back and home key events and
   as a result the notification panel stays open. Hence, after opening the
   notifications panel, pressing the back key on a keyboard will move back
   in the app instead closing the panel. Same happens for the home key.
   The expected behavior is if the panel is open the back button will dismiss
   it and the key should be consumed by the panel. The home key should hide
   the panel and the key should not be consumed by the panel so the system
   can do the right thing.

bug:6902903

Change-Id: I06e8ceea1f51b998e6703d70dcb3a24128d5a581
 2012-08-02 13:44:30 -07:00
Dirk Dougherty
568db47b77 Merge "Doc change: add trademarks attribution." into jb-dev 2012-08-02 13:42:17 -07:00
Brian Carlstrom
4040fccddd am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 
* commit 'd2237dfe7d84c36e5cc9399a444f9befb559af97':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-08-02 10:32:13 -07:00
Brian Carlstrom
fb64fe1b6e am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue" 
* commit '4faeef378e9b82a4ad0fc1d4bb923af1a4f70e4e':
  Improve test key names to reproduce public issue
 2012-08-02 10:32:02 -07:00
Dirk Dougherty
5baafabafd Doc change: add trademarks attribution. 
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
 2012-08-02 09:21:30 -07:00
Scott Main
80adeb535f am 5ae754c9: Merge "fix markup for gl pie" into jb-dev 
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
  fix markup for gl pie
 2012-08-01 17:04:58 -07:00
Scott Main
5ae754c93a Merge "fix markup for gl pie" into jb-dev 2012-08-01 16:59:45 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:49:38 -07:00
Scott Main
a18e0b4647 fix markup for gl pie 
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
 2012-08-01 16:31:19 -07:00
Brian Carlstrom
d2237dfe7d Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 2012-08-01 16:30:54 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
 2012-08-01 16:24:25 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00
Katie McCormick
510d817977 am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit 'a5e150c95c6e7c38fc8643c3615f5664e2cd4582':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:16:22 -07:00
Katie McCormick
a65d0e78dd Doc change: 4K -> 4kb 
Change-Id: Ic563436062c6bd17ba87f3b3cc4c765972b07289
 2012-08-01 16:14:47 -07:00
Katie McCormick
a5e150c95c Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 2012-08-01 16:13:36 -07:00
Scott Main
a9a3c25a52 am c9506415: Group revert of the following commits for design docs: 
* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs:
 2012-08-01 16:07:18 -07:00
Katie McCormick
ec4ec27ea6 cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1 
Change-Id: I6342d1a3925d43719358d905fc29f2628c6e92b4
 2012-08-01 16:01:18 -07:00
Scott Main
c9506415d5 Group revert of the following commits for design docs: 
ce470e17fd4298c1b8aa9a5fd7493bde7a6be840
8874ab0473f4db10e71bf0537c0703db03bac4ee
bdd8d0fada73dabbda7f6f174c17317d1e30a79e
6443ca4cd9406ed8e9ba55461d4b2eb677aad17a
5ac5a324b377c8c5f29a3d368ebfdc76b0d02e3e
1edd4ae5c4748bd9d1e64f65dc554790063d59b8
be13fa0b7ac7929e65b1f3e40b2834ed0d9ed7ff
6a681afd38d9881154207436e5e145856e9d2f75
353474c0acdad9b8ffdb86d3d5f32137885dd720
2b1584c1d53cd1070d5157c07158828b4baf8844

Had to revert these because they're not ready to be published.

Change-Id: I704cf0df1db9aa159295bdf78e97cef9605addc6
 2012-08-01 15:51:29 -07:00
Brian Carlstrom
2a5b147ec8 Change KeyStore to use Modified UTF-8 to match NativeCrypto 
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
 2012-08-01 15:44:52 -07:00
Peter Ng
7bf1831550 am 2b1584c1: new confirming page and updates to progress and iconography 
* commit '2b1584c1d53cd1070d5157c07158828b4baf8844':
  new confirming page and updates to progress and iconography
 2012-08-01 15:12:26 -07:00
Brian Carlstrom
4faeef378e Merge "Improve test key names to reproduce public issue" 2012-08-01 15:06:35 -07:00
Katie McCormick
dd983ad556 cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a
 2012-08-01 14:55:22 -07:00
Katie McCormick
613d0b1253 Doc update: Misc minor GCM updates. 
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd
 2012-08-01 13:45:15 -07:00
Peter Ng
2b1584c1d5 new confirming page and updates to progress and iconography 
Change-Id: I060ac3c34cf268d77b46ac235a2726202a4bb222
 2012-08-01 13:16:02 -07:00
Chris Wren
790474ba3a am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit 'f11e0e7176489f5213acaa7e36c677882854cb8d':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 13:04:02 -07:00
Chris Wren
f11e0e7176 Merge "Add missing docs to notification style rebuilder functions." into jb-dev 2012-08-01 13:01:33 -07:00
Scott Main
c82875e4c1 am e2594672: Merge "dashboard update for 8/1" into jb-dev 
* commit 'e2594672d279234459aba308c093f444b04c5e91':
  dashboard update for 8/1
 2012-08-01 12:54:29 -07:00
Scott Main
e2594672d2 Merge "dashboard update for 8/1" into jb-dev 2012-08-01 12:46:40 -07:00
Robert Greenwalt
6b6ce6bfce am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 
* commit 'a5637bac23611a985696c92b49f93964f435ecb5':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
 2012-08-01 12:14:33 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions. 
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
 2012-08-01 15:06:56 -04:00
Scott Main
45c159e31f dashboard update for 8/1 
Change-Id: I87e037c8128b4108ef94e18e7267304eb22083b9
 2012-08-01 11:20:38 -07:00
Robert Greenwalt
a5637bac23 Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 2012-08-01 11:01:21 -07:00