90682 Commits

Author SHA1 Message Date
Martijn Coenen
f77445cd48 am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit 'b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
  Allow the NFC process to call Bluetooth APIs.
2012-11-30 11:09:43 -08:00
Martijn Coenen
b1a01ab01c Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev 2012-11-30 11:08:07 -08:00
Dianne Hackborn
1bd7d5e47e am 675814d4: Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
* commit '675814d488579582e0214cc720d9ccc310173f25':
  Maybe fix issue #7596986: Frequent runtime restarts; IAE at...
2012-11-30 10:45:02 -08:00
Dianne Hackborn
675814d488 Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev 2012-11-30 10:42:15 -08:00
Nick Kralevich
0def7b9496 am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
  Secure a handful of framework broadcasts
2012-11-30 10:38:21 -08:00
Nick Kralevich
849f5188e3 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts
2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b resolved conflicts for merge of 011132a7 to jb-mr1-dev
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
2012-11-30 10:23:56 -08:00
Daniel Sandler
5dde83c4d1 am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '0a6620e8615ade341336730a5aa9f0e62a295c9f':
  Suppress quick settings if setup has not been completed.
2012-11-30 10:07:01 -08:00
Robert Greenwalt
011132a7d3 am b8da0376: Secure a handful of framework broadcasts
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts
2012-11-30 10:05:33 -08:00
Daniel Sandler
0a6620e861 Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 2012-11-30 10:05:01 -08:00
Scott Main
0988f445a1 am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '73117424029ce1983f2f0a2f706d08e1f5870955':
  docs: gms and gcm javadocs
2012-11-30 10:01:19 -08:00
Scott Main
7311742402 am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '580aa579080b5f4ccddb31964bc0caa76ee73a7a':
  docs: gms and gcm javadocs
2012-11-30 09:59:42 -08:00
Scott Main
580aa57908 Merge "docs: gms and gcm javadocs" into jb-mr1-dev 2012-11-30 09:56:48 -08:00
Scott Main
f239a76c15 am 3cddba24: am b74844cd: docs: revise doc titles
* commit '3cddba247e4f9c188cc654a0c3df9db693874199':
  docs: revise doc titles
2012-11-30 09:52:22 -08:00
Scott Main
3cddba247e am b74844cd: docs: revise doc titles
* commit 'b74844cd87160a21a77cdc1c35b3d19ce9f47249':
  docs: revise doc titles
2012-11-30 09:49:51 -08:00
Scott Main
b74844cd87 docs: revise doc titles
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
2012-11-30 09:46:26 -08:00
Makoto Onuki
9522972108 am c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
* commit 'c50ed032c71069893d9ad0bb81ee8013fdd44d66':
  Remove unused IExtendedNetworkService
2012-11-30 09:36:11 -08:00
Makoto Onuki
c50ed032c7 Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev 2012-11-30 09:33:11 -08:00
Eric Laurent
b1f45c4a58 am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
* commit 'c3eb57b22f930f07448e877f0814eb5659bfc3c5':
  AudioService: improve initial safe volume delay
2012-11-30 09:28:56 -08:00
Eric Laurent
c3eb57b22f Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 2012-11-30 09:26:30 -08:00
Daniel Sandler
71988c81a3 am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit '386165a3ae09b150165e8e7c310e194231071271':
  Only show "charging" if the battery is really charging.
2012-11-30 07:29:46 -08:00
Daniel Sandler
386165a3ae Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 2012-11-30 07:27:36 -08:00
Robert Ly
3c4b4f7c31 docs: gms and gcm javadocs
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
2012-11-30 04:02:04 -08:00
Dirk Dougherty
6875b4385c am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit 'a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:17:03 -08:00
Dirk Dougherty
a4f67a88f4 am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '49be1ef39cfa2c718cb56dee088338ea97019c11':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
2012-11-29 21:15:04 -08:00
Dirk Dougherty
49be1ef39c Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 2012-11-29 21:11:24 -08:00
Baligh Uddin
02d29ff5fe am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit 'a1b3b99c7f1c53648b4d2e631a1042be27173cd1':
  Import translations. DO NOT MERGE
2012-11-29 21:09:05 -08:00
Dirk Dougherty
2b286bb26b Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
2012-11-29 21:07:41 -08:00
Baligh Uddin
cb21c8cc2b am 2c2b232b: am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2c2b232b4135e1534b00fb2690c72c0dc9266b2f':
  Import translations. DO NOT MERGE
2012-11-29 21:07:30 -08:00
Baligh Uddin
a1b3b99c7f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:06:23 -08:00
Baligh Uddin
2c2b232b41 am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2138e5c0f6b78e0e248945da498bd716c928505f':
  Import translations. DO NOT MERGE
2012-11-29 21:06:04 -08:00
Baligh Uddin
2138e5c0f6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-29 21:03:06 -08:00
Baligh Uddin
497a40e0b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-29 21:02:10 -08:00
Scott Main
ddf9c3fdce am 48e794da: am 9748abb6: docs: add maps v2 announcement
* commit '48e794dac4135a626b8b2135874331ffe3ace34f':
  docs: add maps v2 announcement
2012-11-29 19:07:26 -08:00
Scott Main
48e794dac4 am 9748abb6: docs: add maps v2 announcement
* commit '9748abb66865849840f9d36d7ab68eae0ce7357c':
  docs: add maps v2 announcement
2012-11-29 19:05:20 -08:00
Scott Main
9748abb668 docs: add maps v2 announcement
Change-Id: Ibf9b7ac02ffc8f70b48bcede4df929ec089108c5
2012-11-29 18:24:56 -08:00
Dianne Hackborn
ed74c10f13 am aae329ef: Merge "Don\'t apply transformation fudge when not rotating." into jb-mr1.1-dev
* commit 'aae329ef0f68e30897faef55c86548dab0eadf37':
  Don't apply transformation fudge when not rotating.
2012-11-29 17:56:58 -08:00
Dianne Hackborn
aae329ef0f Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev 2012-11-29 17:53:47 -08:00
Dianne Hackborn
4b16969b00 Don't apply transformation fudge when not rotating.
There is this stupid fudge factor applied to window transformations
when doing a screen rotation animation.  We need this when rotating,
but when not rotating it causes very visible artifacts.  Historically
the non-rotation case only happened due to configuration changes, so
wasn't that big a deal.  Now however that we use this when switching
users, it is more annoying.  So get rid of it for such cases.

Change-Id: I6b343866c1bad9b16984b4a629917c2f1bb37b9e
2012-11-29 17:51:24 -08:00
Eric Laurent
05274f348e AudioService: improve initial safe volume delay
AudioService relies on a valid mmc in order to enforce the headset
volume limitation or not. There is a timeout to enforce the limitation
if no mcc is configured after boot.
Until this timeout is reached or a valid SIM is detected the headset
volume is not limited.

This change makes that the last known volume limitation state (enforced or
not) is persisted so that next time we boot, last known state is applied until
a new mcc is configured if any. In most cases, the mcc does not change from one
boot to the next and we do the right thing. If teh mcc does change, the correct
policy will be enforced when the mcc is detected or after the timeout.

Also fix a bug where the volume panel was not displayed if the limitation mechanism
is triggered at the first press on VOL+ key.

Bug 7455275.

Change-Id: Id0f2996d893d38c6a14f4f9e4a0e9e3be17ef127
2012-11-29 17:46:05 -08:00
Dianne Hackborn
40ca751ba0 am ebec2315: Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
* commit 'ebec2315353941890471aa901e87f19f681d007a':
  Always report user switched after unfreezing screen.
2012-11-29 16:41:44 -08:00
Dianne Hackborn
ebec231535 Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev 2012-11-29 16:38:23 -08:00
Dianne Hackborn
6c5406acd7 Maybe fix issue #7596986: Frequent runtime restarts; IAE at...
...android.os.Parcel.nativeAppendFrom(Native Method)

The failing stack trace is:

11-20 20:29:04.365 19154 19170 E AndroidRuntime: java.lang.IllegalArgumentException
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.nativeAppendFrom(Native Method)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.appendFrom(Parcel.java:428)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Bundle.writeToParcel(Bundle.java:1613)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeBundle(Parcel.java:605)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.location.Location.writeToParcel(Location.java:903)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeParcelable(Parcel.java:1254)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeValue(Parcel.java:1173)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeMapInternal(Parcel.java:591)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Bundle.writeToParcel(Bundle.java:1619)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeBundle(Parcel.java:605)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.location.Location.writeToParcel(Location.java:903)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeParcelable(Parcel.java:1254)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeValue(Parcel.java:1173)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeMapInternal(Parcel.java:591)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Bundle.writeToParcel(Bundle.java:1619)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.os.Parcel.writeBundle(Parcel.java:605)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.content.Intent.writeToParcel(Intent.java:6660)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at android.app.ApplicationThreadProxy.scheduleReceiver(ApplicationThreadNative.java:763)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at com.android.server.am.BroadcastQueue.processCurBroadcastLocked(BroadcastQueue.java:230)
11-20 20:29:04.365 19154 19170 E AndroidRuntime:        at com.android.server.am.BroadcastQueue.processNextBroadcast(BroadcastQueue.java:777)

This is odd because where we do Bundle.writeToParcel(), we are just writing the Parcel
we have with its current length.  There is no way this should be able to fail like this...
unless the Bundle is changed while we are running?

Hm.

It looks like the location manager is holding on to Location objects which have a
Bundle of extras.  It is that Bundle of extras that the crash is happening on.
And the bundle extras can be changed as it operates.  And there are places where
the raw Location object is returned from the location manager, which means the
caller can be olding on to a Location object whose extras can be changed at any
time by other threads in the location manager.

So that seem suspicious.

This change should take care of all these places in the location manager, by
making sure to copy the location object before it goes out of the location
manager.

In addition, add some code to the activity manager to not bring down the entire
system if there is a problem trying to send one of these broadcasts.  There is
no need, we can just skip the broadcast as bad.

Change-Id: I3043c1e06f9d2931a367f831b6a970d71b0d0621
2012-11-29 16:33:54 -08:00
Zhihai Xu
ec7a8b6f74 am e1a867f6: Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
* commit 'e1a867f68d3727908be1c2cfc90a5ba6a5785c17':
  BluetoothManagerService call should allow SYSTEM_UID
2012-11-29 16:06:17 -08:00
Zhihai Xu
e1a867f68d Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev 2012-11-29 16:03:49 -08:00
Winson Chung
c93d558a53 am 818b2f34: Merge "Fixing issue where you can still click on a widget on a side page. (Bug 7568412)" into jb-mr1.1-dev
* commit '818b2f341c7a5afc08c6d1d26469101f3885def0':
  Fixing issue where you can still click on a widget on a side page. (Bug 7568412)
2012-11-29 16:01:34 -08:00
Winson Chung
818b2f341c Merge "Fixing issue where you can still click on a widget on a side page. (Bug 7568412)" into jb-mr1.1-dev 2012-11-29 15:59:45 -08:00
Michael Jurka
d2de8033a3 am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev
* commit 'a8d63ec9f328e56d9ccad385f137a30fa104c1a7':
  Disable adding keyguard widgets until setup is done
2012-11-29 15:54:47 -08:00
Michael Jurka
a8d63ec9f3 Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 2012-11-29 15:51:13 -08:00
Zhihai Xu
6eb7652b04 BluetoothManagerService call should allow SYSTEM_UID
bug 7561429

Change-Id: I1483bfe1361f71c7ae3529ea496b33504b95413e
2012-11-29 15:41:04 -08:00