Amith Yamasani
0f469f4f7e
am 32df98d5: am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
...
* commit '32df98d52d482498d998b424684610c15098897a':
Fix crosstalk between users for widgets hosted in lockscreen
2012-11-30 18:46:45 -08:00
Amith Yamasani
32df98d52d
am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
...
* commit 'c566b43d02596cba437e9a2723e9f989297cca72':
Fix crosstalk between users for widgets hosted in lockscreen
2012-11-30 18:44:36 -08:00
Amith Yamasani
c566b43d02
Fix crosstalk between users for widgets hosted in lockscreen
...
This was initially about the Clock widget crashing repeatedly on some
devices with multiple users. Turned out that there were race conditions
when switching users that could result in remote views of one user calling
back to the RemoteViewsAdapter in keyguard that in turn sent an incorrect widget id
to a different user's widget, resulting in a crash.
Since KeyguardHostView is instantiated in the same process for different users,
it needs to carry a user identity to pass along to AppWidgetService so that
remote views services were bound to the correct user and callbacks were attached and
detached properly.
Added some aidl calls that take the userId to do the binding properly. A more
complete fix might be needed in the future so that all calls from Keyguard carry
the user id.
Also, there was a problem in comparing host uid for secondary users, since Settings
for a secondary user has a different uid than keyguard. Not an issue on single-user
systems. Changed the host.uid comparison to accomodate for the secondary user.
Bug: 7450247
Change-Id: Idbc36e3c60023cac74174f6cb7f2b2130dd3052c
2012-11-30 17:28:08 -08:00
Fabrice Di Meglio
2e8dd459fb
am 4e1b2f44: am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '4e1b2f44e9f43b123e00eb210c9fa4ec78710782':
Fix typos in LinearLayout comments
2012-11-30 17:20:44 -08:00
Fabrice Di Meglio
4e1b2f44e9
am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '20b76b9fff076241fe305fc99be3be7ab7d10407':
Fix typos in LinearLayout comments
2012-11-30 17:18:49 -08:00
Fabrice Di Meglio
20b76b9fff
am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '1e761ded55695a9d76a6f00ee9504625581e8d3a':
Fix typos in LinearLayout comments
2012-11-30 17:17:03 -08:00
Fabrice Di Meglio
1e761ded55
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
2012-11-30 17:14:11 -08:00
Fabrice Di Meglio
8794c80dd7
am a9854ce9: am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
...
* commit 'a9854ce9dfac086533e9d49ac75076bcc579303b':
Fix bug #7651552 resetRtlProperties() is called way too often
2012-11-30 16:46:00 -08:00
Fabrice Di Meglio
a9854ce9df
am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
...
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
Fix bug #7651552 resetRtlProperties() is called way too often
2012-11-30 16:41:12 -08:00
Fabrice Di Meglio
ce463847db
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
2012-11-30 16:37:17 -08:00
Nicolas Klein
ca4199ef8b
am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '04f3b12f1f82784d0b1b8c0812a3d0017b17b69e':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:44:17 -08:00
Nicolas Klein
04f3b12f1f
am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:41:10 -08:00
Fabrice Di Meglio
cb5f9db47a
Fix bug #7651552 resetRtlProperties() is called way too often
...
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)
Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
2012-11-30 15:32:56 -08:00
Nicolas Klein
5ea914f21b
am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 14:54:50 -08:00
Nicolas Klein
9f6cb87522
Fix some typos and missing @param in android.os.Bundle
...
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
Daniel Sandler
57b47ae95d
am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
Add constant for Daydream settings.
2012-11-30 13:22:03 -08:00
Svetoslav Ganov
d902dbb2ea
am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit 'ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:21:53 -08:00
Daniel Sandler
9e129f37b6
am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
2012-11-30 13:17:22 -08:00
Svetoslav Ganov
ed734d98d0
am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:17:08 -08:00
Daniel Sandler
924fc3e6ce
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
2012-11-30 13:03:08 -08:00
Svetoslav Ganov
0e7adaff99
am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 12:40:37 -08:00
Svetoslav Ganov
438a3b35f7
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
2012-11-30 11:43:54 -08:00
Eric Laurent
b46857d228
am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
...
* commit 'b1f45c4a587e5adda39774a867c78b56682c5f0d':
AudioService: improve initial safe volume delay
2012-11-30 09:31:03 -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
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
84ea428d24
am ed8c323a: am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 14:28:24 -08:00
zzy
de95a276e7
am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size
...
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
timeout support for accept() and added check for signal size
2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad
am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
...
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2
am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
...
* commit '462633695774a3cfd84b5c729266d039ec686a64':
Fix time-related ScaleGestureDetector methods
2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975
am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
...
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-29 14:26:57 -08:00
Dianne Hackborn
5007dea96e
am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev
...
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
Cleaner initial boot.
2012-11-29 14:26:37 -08:00
Adam Cohen
20b9edd805
am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
2012-11-29 14:26:29 -08:00
Fabrice Di Meglio
52c3833e20
am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
...
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
Fix bug #7621927 Radio button/TextView drawable regression in 4.2
2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723
am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
...
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
Quiet down a lot of logging.
2012-11-29 14:25:40 -08:00
Daniel Sandler
c08cd02649
Add constant for Daydream settings.
...
Bug: 7480927
Change-Id: I383170c6c543b5ffe81568d273389585498d369b
2012-11-29 15:24:39 -05:00
Dianne Hackborn
ed8c323a6c
am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049
Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc
Fix issue #7585876 : When changing the font settings, the movie...
...
...just keeps attempting to load and doesn't play on the TV
Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
2012-11-29 11:59:58 -08:00
Elliott Hughes
878da65328
am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."
...
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
Fix AndroidHttpClient documentation error.
2012-11-29 10:21:23 -08:00
Elliott Hughes
9ed4abd875
Merge "Fix AndroidHttpClient documentation error."
2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb
am 820b3e29: Merge "Make transactGetSockaddr locale safe"
...
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
Make transactGetSockaddr locale safe
2012-11-29 09:14:35 -08:00
Elliott Hughes
820b3e29ca
Merge "Make transactGetSockaddr locale safe"
2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3
Fix AndroidHttpClient documentation error.
...
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.
Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
2012-11-29 08:32:13 -08:00
zzy
3fe63ce4a9
am 652678af: timeout support for accept() and added check for signal size
...
* commit '652678af4d18b9a6c18ce6a860de01d958bc82fe':
timeout support for accept() and added check for signal size
2012-11-29 00:30:28 -08:00
zzy
652678af4d
timeout support for accept() and added check for signal size
...
bug 7592240
Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
2012-11-28 22:12:27 -08:00
Fabrice Di Meglio
146b129075
am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
...
* commit 'cdc6d5cf88e8eb73a557052679c436e864cb1853':
Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
2012-11-28 19:50:49 -08:00
Adam Powell
4626336957
am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
...
* commit '66cedab63bf0c17e59a5815200bd9200164d89ec':
Fix time-related ScaleGestureDetector methods
2012-11-28 19:50:46 -08:00
Adam Powell
57c23a464a
am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
...
* commit '10479a29cbdc55cfd25b30cd792a151234b55fa6':
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-28 19:50:43 -08:00
Fabrice Di Meglio
cdc6d5cf88
Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
2012-11-28 19:08:45 -08:00