82552 Commits

Author SHA1 Message Date
The Android Open Source Project
0e51c94c98 Reconcile AOSP and GOOG jb-release
Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f
2012-08-03 12:11:54 -07:00
Jeff Sharkey
0b24b1d37a Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev 2012-08-03 11:56:03 -07:00
Jeff Sharkey
821bd8081a Pass changed NetworkInfo to LocationProvider.
LocationProviders often rely on non-default networks, so pass the
network that actually changed, instead of the default.

Bug: 6929692
Change-Id: I31d9eec792e07259282aa1bb57ec66c01962df64
2012-08-03 11:53:01 -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
Romain Guy
a70cd04985 Merge "Add dithering to gradients" into jb-mr1-dev 2012-08-03 11:09:49 -07:00
Chris Wren
5345c310af Merge "Don't allow the status bar to collapse things we're touching." into jb-mr1-dev 2012-08-03 09:52:09 -07:00
John Spurlock
3185b376b0 Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev 2012-08-03 08:36:41 -07:00
Martijn Coenen
10d7e8afb2 Bluetooth: fix enableNoAutoConnect() call.
For now, just do a regular connect.

Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
2012-08-03 08:36:02 -07:00
John Spurlock
72c30e2cec Merge "Fix typos in android.widget package docs." into jb-mr1-dev 2012-08-03 08:34:43 -07:00
Craig Mautner
7de53949bc Merge "Add features to DisplayManager." into jb-mr1-dev 2012-08-03 08:25:42 -07:00
John Spurlock
aca7a741cb Fix typos in android.widget package docs.
Fixed spelling errors and cleaned up markup.

Change-Id: I3573087d40bbeb3906a8361abb02de4cb4325a92
2012-08-03 09:14:32 -04:00
John Spurlock
bc632a28e4 Re-enable dreams: frameworks/base
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package.  Add isDreaming() method to service.

Re-arrange the Dream api a bit.  (use onStart as hook for subclasses).
Coordinate properly with power manager.

Replace old dock mode (don't fire old intent).

Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug: 6921930
2012-08-03 08:51:17 -04:00
Mathias Agopian
187019c51f Merge "screen-off animation won't be handled by SF anymore" into jb-mr1-dev 2012-08-02 21:49:25 -07:00
Jeff Brown
fbe963f4ad Merge "Remove unnecessary code." into jb-mr1-dev 2012-08-02 21:36:33 -07:00
Jeff Brown
5098fd8a0e Remove unnecessary code.
Bug: 6926595
Change-Id: Ice3138675c024e9efe9c7922e1e0a05f19cdde54
2012-08-02 21:34:46 -07:00
Mathias Agopian
893a0e71a7 screen-off animation won't be handled by SF anymore
Change-Id: I66ad02b07b1148c1610e9c29ba80450d49c22806
2012-08-02 21:29:54 -07:00
Dianne Hackborn
329465c6b2 Merge "Add APIs for interacting across users." into jb-mr1-dev 2012-08-02 19:14:39 -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
Dianne Hackborn
b4163a6e12 Add APIs for interacting across users.
- Expose the existing Context.sendBroadcast() as
  Context.sendBroadcastAsUser().
- Add new android:singleUser attribute for services.
- Add new INTERACT_ACROSS_USERS_FULL permission for full
  system-level access to cross-user interface (allows
  sendBroadcastAsUser() to send to any receiver).
- Add new INTERACT_ACROSS_USERS_FULL permission for
  more restricted cross-user interaction: this is required
  for android:singleUser, and allows you to use
  sendBroadcastAsUser() but only to send to your own
  receivers.

Change-Id: I0de88f6718e9505f4de72e3f45d29c0f503b76e9
2012-08-02 19:07:57 -07:00
Adam Powell
478923885d Make AutoCompleteTextView#setText(CharSequence, boolean) public
Bug 6807326

Public bug http://code.google.com/p/android/issues/detail?id=34690

Make this available for use by applications that wish to make
programmatic changes to the AutoCompleteTextView without filtering.

Change-Id: I889452d3b19b378258ad9247f3d254afee1e8408
2012-08-02 17:30:32 -07:00
Robert Greenwalt
84aa999ed2 am 2cb7db11: resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
* commit '2cb7db116f738b9c88f3aeceb345cbdc99de04ce':
  Fix a logging NPE problem
2012-08-02 17:26:29 -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
George Mount
daceb30bf5 Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 2012-08-02 16:28:03 -07:00
Svetoslav Ganov
25dd892ce9 am e1c47324: am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
* commit 'e1c47324fc22f86f378cb6ccc51e4554eec5156b':
  Notification panel on tablet does not handle back and home key events.
2012-08-02 16:07:35 -07:00
Robert Greenwalt
41508f0544 Fix a logging NPE problem
bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
2012-08-02 16:06:56 -07:00
Dirk Dougherty
6677951135 am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
* commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
  Doc change: add trademarks attribution.
2012-08-02 15:39:55 -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
George Mount
df9cae4de3 Cancel handler for JS unload handler prevents hang.
Bug 6803309
 When the alert dialog raised by the JS unload handler was pressed
 outside the alert region, it was canceled and no response was
 sent back to WebViewCore. This captures the cancel event so that
 WebViewCore doesn't hang.

Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
Jeff Brown
f95f3ebf12 Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev 2012-08-02 14:58:47 -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
Brian Carlstrom
7786687e7e am 4040fccd: am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
* commit '4040fccdddcc4669b01979572c8289b2d674a711':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-08-02 14:56:59 -07:00
Brian Carlstrom
d9ea9c9851 am fb64fe1b: am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
* commit 'fb64fe1b6ed02f9e52694029f1efe47665353d48':
  Improve test key names to reproduce public issue
2012-08-02 14:56:55 -07:00
Jeff Brown
e7c1d88fba Allow access to display manager service from isolated processes.
Bug: 6921302
Change-Id: I9eed4a24992538e18ad0540b96a8cea2c8a9ef76
2012-08-02 14:55:26 -07:00
Adam Powell
19e662baa9 Merge "Fix some ActionBar menu issues around config changes" into jb-mr1-dev 2012-08-02 14:53:22 -07:00
Adam Powell
d5c81db1e7 Fix some ActionBar menu issues around config changes
Bug 6904212

Update allow-text and max item height properties for action bar menu
item views properly.

Fix an ActionMenuItemView measurement bug that could cause items to
measure too small.

Change-Id: Ibac8491f7670969b0ae4584fff5e44ebd1435abd
2012-08-02 14:50:55 -07:00
Craig Mautner
9de4936c99 Add features to DisplayManager.
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.

Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
2012-08-02 14:30:30 -07:00
Chris Wren
3ddab0dcc1 Don't allow the status bar to collapse things we're touching.
Bug: 6538918
Change-Id: Ie4e79aa593ac2097d0e6402f84816df934160687
2012-08-02 16:55:08 -04: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
Craig Mautner
2a642a450a Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev 2012-08-02 13:16:13 -07:00
rich cannings
9866d60ea4 Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-02 12:57:11 -07:00
Marco Nelissen
8ab2dc2f96 Improve scan time for some cases
When the path being matched has a sqlite wildcard character in it, a "like"
match will be quite slow. Unfortunately this is fairly common, since "_"
is a wildcard character. However, because in most cases the case of the path
in the database will match the case on disk, an "=" match will work, so it
is worthwhile to try an "=" match first, before trying a "like".

If there are no wildcard characters, the "like" will be as fast as the "=",
because of the case-insensitive index on the _data column, so there is no
need to try "=" first in that case.

b/6751354

Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
2012-08-02 12:32:05 -07:00
Adam Powell
b1758cf8cd Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev 2012-08-02 11:28:45 -07:00
rich cannings
24713907fe Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: If9ff6663ad7f3426b7aea2aceb1413b689788138
2012-08-02 11:26:47 -07:00
Adam Powell
e468187870 Make MediaRouteButton focusable by default
Bug 6921236

Add a default contentDescription for MediaRouteButton.

Add long-press "cheat sheet" support to MediaRouteButtons created by
MediaRouteActionProvider for use in the action bar to match standard
action button behavior.

Change-Id: I313cfcb2349210765b084c3388095de4624009e8
2012-08-02 11:23:55 -07:00