OSDN Git Service
Nick Kralevich [Fri, 30 Nov 2012 18:35:44 +0000 (10:35 -0800)]
am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:23:56 +0000 (10:23 -0800)]
resolved conflicts for merge of
011132a7 to jb-mr1-dev
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am
b8da0376: Secure a handful of framework broadcasts
* commit '
b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
Daniel Sandler [Fri, 30 Nov 2012 18:05:01 +0000 (10:05 -0800)]
Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
Scott Main [Fri, 30 Nov 2012 17:59:42 +0000 (09:59 -0800)]
am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
580aa579080b5f4ccddb31964bc0caa76ee73a7a':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 17:56:48 +0000 (09:56 -0800)]
Merge "docs: gms and gcm javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 17:49:51 +0000 (09:49 -0800)]
am
b74844cd: docs: revise doc titles
* commit '
b74844cd87160a21a77cdc1c35b3d19ce9f47249':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 05:13:30 +0000 (21:13 -0800)]
docs: revise doc titles
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
Makoto Onuki [Fri, 30 Nov 2012 17:33:09 +0000 (09:33 -0800)]
Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
Eric Laurent [Fri, 30 Nov 2012 17:26:30 +0000 (09:26 -0800)]
Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
Daniel Sandler [Fri, 30 Nov 2012 15:27:36 +0000 (07:27 -0800)]
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
Robert Ly [Fri, 30 Nov 2012 12:02:04 +0000 (04:02 -0800)]
docs: gms and gcm javadocs
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
Dirk Dougherty [Fri, 30 Nov 2012 05:15:04 +0000 (21:15 -0800)]
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.
Dirk Dougherty [Fri, 30 Nov 2012 05:11:24 +0000 (21:11 -0800)]
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
Dirk Dougherty [Fri, 30 Nov 2012 01:25:09 +0000 (17:25 -0800)]
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
Baligh Uddin [Fri, 30 Nov 2012 05:05:08 +0000 (21:05 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:06:04 +0000 (21:06 -0800)]
am
2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2138e5c0f6b78e0e248945da498bd716c928505f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:02:54 +0000 (21:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 03:05:20 +0000 (19:05 -0800)]
am
9748abb6: docs: add maps v2 announcement
* commit '
9748abb66865849840f9d36d7ab68eae0ce7357c':
docs: add maps v2 announcement
Scott Main [Thu, 29 Nov 2012 22:28:44 +0000 (14:28 -0800)]
docs: add maps v2 announcement
Change-Id: Ibf9b7ac02ffc8f70b48bcede4df929ec089108c5
Dianne Hackborn [Fri, 30 Nov 2012 01:53:47 +0000 (17:53 -0800)]
Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev
Dianne Hackborn [Fri, 30 Nov 2012 01:51:24 +0000 (17:51 -0800)]
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
Eric Laurent [Thu, 29 Nov 2012 20:48:18 +0000 (12:48 -0800)]
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
Dianne Hackborn [Fri, 30 Nov 2012 00:38:22 +0000 (16:38 -0800)]
Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
Zhihai Xu [Fri, 30 Nov 2012 00:03:46 +0000 (16:03 -0800)]
Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
Winson Chung [Thu, 29 Nov 2012 23:59:40 +0000 (15:59 -0800)]
Merge "Fixing issue where you can still click on a widget on a side page. (Bug
7568412)" into jb-mr1.1-dev
Michael Jurka [Thu, 29 Nov 2012 23:51:13 +0000 (15:51 -0800)]
Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev
Zhihai Xu [Thu, 29 Nov 2012 23:41:04 +0000 (15:41 -0800)]
BluetoothManagerService call should allow SYSTEM_UID
bug
7561429
Change-Id: I1483bfe1361f71c7ae3529ea496b33504b95413e
Dianne Hackborn [Thu, 29 Nov 2012 23:10:18 +0000 (15:10 -0800)]
Always report user switched after unfreezing screen.
Change-Id: I58172896892a07e72a3430e56e4d2944d388c7c9
Robert Ly [Thu, 29 Nov 2012 22:22:13 +0000 (14:22 -0800)]
am
830b23b7: docs: gms javadocs
* commit '
830b23b76676542cbcb5ef3c60c869460d4c5466':
docs: gms javadocs
Robert Ly [Thu, 29 Nov 2012 22:17:31 +0000 (14:17 -0800)]
am
aae17137: docs: update gms toc and landing pages
* commit '
aae171371b044d4efe4b58589f3b04f000016cec':
docs: update gms toc and landing pages
Robert Ly [Thu, 29 Nov 2012 21:40:49 +0000 (13:40 -0800)]
docs: gms javadocs
Change-Id: Ibcae03cab861c90a589f39a860889a3f4e6a55ad
Daniel Sandler [Thu, 29 Nov 2012 20:52:39 +0000 (15:52 -0500)]
Suppress quick settings if setup has not been completed.
The button was already hidden, but there are lots of other
ways to get into QS that should check for USER_SETUP.
Bug:
7638795
Change-Id: Ib6c48fc02e833670768e7dc76e25c38097b88c18
Michael Jurka [Thu, 29 Nov 2012 00:51:00 +0000 (16:51 -0800)]
Disable adding keyguard widgets until setup is done
Bug:
7504154
Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
Robert Ly [Wed, 28 Nov 2012 22:04:29 +0000 (14:04 -0800)]
docs: update gms toc and landing pages
Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a
Robert Greenwalt [Thu, 29 Nov 2012 00:42:32 +0000 (16:42 -0800)]
Secure a handful of framework broadcasts
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.
bug:
7622253
(cherry picked from commit
47918ae3b4e7ebb54711884e9ff9d0300591ab8b)
Conflicts:
core/res/AndroidManifest.xml
Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
Robert Ly [Thu, 29 Nov 2012 21:04:23 +0000 (13:04 -0800)]
am
64e4ed8d: Merge "docs: fix bug
7628699" into jb-mr1-dev
* commit '
64e4ed8d67376e519c2d0d5e70a1375f8a8760eb':
docs: fix bug
7628699
Robert Ly [Thu, 29 Nov 2012 21:01:59 +0000 (13:01 -0800)]
Merge "docs: fix bug
7628699" into jb-mr1-dev
Makoto Onuki [Thu, 29 Nov 2012 19:05:42 +0000 (11:05 -0800)]
Remove unused IExtendedNetworkService
It was used in the cupcake era for docomo. Is not used anymore.
Bug
7633569
Change-Id: I2ec826fc9a70d261a340957a937ed4c9f8e67c5c
Colin Cross [Thu, 29 Nov 2012 20:47:54 +0000 (12:47 -0800)]
Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
Colin Cross [Thu, 29 Nov 2012 19:42:11 +0000 (11:42 -0800)]
trigger kernel blocked stack trace on system server watchdog
Bug b/
7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions. Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.
Bug:
7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
Daniel Sandler [Thu, 29 Nov 2012 20:11:50 +0000 (15:11 -0500)]
Only show "charging" if the battery is really charging.
If there's a charge problem (battery health/temperature out
of spec, or low charging current), the lockscreen and status
bar should not indicate that charging is occurring.
(Previously we showed "Charging" and a lightning bolt any
time the device was plugged in.)
Bug:
7509976
Change-Id: I27ec0e2cec1307fbc6ef262dd5181a4db6d3bed0
Dianne Hackborn [Thu, 29 Nov 2012 20:05:32 +0000 (12:05 -0800)]
Merge "Fix issue #
7585876: When changing the font settings, the movie..." into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 19:59:58 +0000 (11:59 -0800)]
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
John Spurlock [Thu, 29 Nov 2012 19:45:57 +0000 (11:45 -0800)]
Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
John Spurlock [Thu, 29 Nov 2012 19:40:29 +0000 (11:40 -0800)]
Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
Scott Main [Thu, 29 Nov 2012 19:31:02 +0000 (11:31 -0800)]
am
77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev
* commit '
77ea05d0063cd0b417c3681e6c58bbebdaeb2d88':
docs: update landing page for Google Services
Scott Main [Thu, 29 Nov 2012 19:28:05 +0000 (11:28 -0800)]
Merge "docs: update landing page for Google Services" into jb-mr1-dev
Scott Main [Thu, 29 Nov 2012 03:23:17 +0000 (19:23 -0800)]
docs: update landing page for Google Services
Change-Id: I7d7543282158474b8e722a9833ddf15a1e4e03f8
Daniel Sandler [Thu, 29 Nov 2012 19:20:24 +0000 (11:20 -0800)]
Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev
John Spurlock [Thu, 29 Nov 2012 18:56:24 +0000 (13:56 -0500)]
Fix multiuser bug in StatusBarManagerService.
First, do no harm.
Bug:
7638210
Change-Id: I113b574a021d601b0c79d65a3b4b72eeb4c667ad
Victoria Lease [Thu, 29 Nov 2012 19:09:03 +0000 (11:09 -0800)]
Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev
Christopher Tate [Thu, 29 Nov 2012 18:55:52 +0000 (10:55 -0800)]
am
67b38c44: Cache resource ID lookups in aapt
* commit '
67b38c44e8b04b97e357664804d593823b2a34ed':
Cache resource ID lookups in aapt
Craig Mautner [Thu, 29 Nov 2012 17:57:14 +0000 (09:57 -0800)]
Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Thu, 29 Nov 2012 17:02:02 +0000 (09:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie73d50cbd57de973c7a01c51eedbf807fb7526e4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Nov 2012 16:59:36 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ba3917c7ad5b6ec719f22aa79ce6132aea74b39
Auto-generated-cl: translation import
Daniel Sandler [Thu, 29 Nov 2012 16:35:02 +0000 (11:35 -0500)]
Flush the clock format when the locale changes.
Bug:
7569120
Change-Id: If85ff36c7fac8b07f10b7077afd23255a145db1c
John Spurlock [Thu, 29 Nov 2012 14:52:21 +0000 (09:52 -0500)]
Fix for navbar back/home appearing in keyguard (multiuser).
Clear remembered sysui visibility flags in PhoneWindowManager
when switching users. They might have been from another user.
Then reapply current window's flags to ensure contribution
makes it to the status bar.
Bug:
7506446
Change-Id: I8249ba006934bdc22b952da7c16e9983d091c489
Craig Mautner [Thu, 15 Nov 2012 22:25:14 +0000 (14:25 -0800)]
Fix math errors causing black screen. DO NOT MERGE
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.
A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.
Bug
7515609 fixed.
Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
zzy [Thu, 22 Nov 2012 19:52:44 +0000 (11:52 -0800)]
timeout support for accept() and added check for signal size
bug
7592240
Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
Fabrice Di Meglio [Thu, 29 Nov 2012 03:08:33 +0000 (19:08 -0800)]
Merge "Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 03:06:50 +0000 (19:06 -0800)]
Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 03:02:37 +0000 (19:02 -0800)]
Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
Adam Powell [Thu, 29 Nov 2012 02:49:12 +0000 (18:49 -0800)]
Merge "Import assets from UX" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:46:45 +0000 (18:46 -0800)]
Fix build.
Change-Id: Icc1f2913b4e889609066b0ff1dddcd9be0230897
Adam Powell [Thu, 29 Nov 2012 02:41:10 +0000 (18:41 -0800)]
Import assets from UX
Fixes issues with scaling/dithering artifacts in dialog/menu panel
assets.
Bug
7589786
Change-Id: I1285f9de5f8bcd0decfa7765c1463e444a56b335
Adam Powell [Thu, 29 Nov 2012 02:29:22 +0000 (18:29 -0800)]
Fix time-related ScaleGestureDetector methods
Bug
7626515
Change-Id: Ie7abf9c166284a74b4e7bcf9de25520cf08e3b2d
Dianne Hackborn [Thu, 29 Nov 2012 02:19:09 +0000 (18:19 -0800)]
Merge "Cleaner initial boot." into jb-mr1.1-dev
Chris Craik [Thu, 29 Nov 2012 02:11:22 +0000 (18:11 -0800)]
Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:05:36 +0000 (18:05 -0800)]
Cleaner initial boot.
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.
Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
Adam Cohen [Thu, 29 Nov 2012 01:47:22 +0000 (17:47 -0800)]
Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
Robert Greenwalt [Thu, 29 Nov 2012 01:40:02 +0000 (17:40 -0800)]
Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
Fabrice Di Meglio [Tue, 27 Nov 2012 04:05:31 +0000 (20:05 -0800)]
Fix bug #
7617883 RelativeLayout is not having the correct width when in RTL mode
- fix onMeasure() in RTL mode: need to compute width before computing layout params
that are used for layout
- fix getRelatedView() so that it uses the resolved rules
- add some extra "final" statements
Change-Id: I7c3bf841cd18c5f77b010a9be20fa78069e88d94
Robert Greenwalt [Thu, 29 Nov 2012 00:42:32 +0000 (16:42 -0800)]
Secure a handful of framework broadcasts
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.
bug:
7622253
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
Adam Cohen [Thu, 29 Nov 2012 00:34:57 +0000 (16:34 -0800)]
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
Irfan Sheriff [Thu, 29 Nov 2012 00:28:40 +0000 (16:28 -0800)]
Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
Irfan Sheriff [Wed, 28 Nov 2012 23:54:06 +0000 (15:54 -0800)]
WFD: Fallback to PIN mode if PBC is not supported
Bug:
7627641
Change-Id: Ibba6114f907c67f1cb60c460d5b65479f2d1b148
Christopher Tate [Fri, 16 Nov 2012 23:58:08 +0000 (15:58 -0800)]
Cache resource ID lookups in aapt
This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK. Windows-based
use should particularly benefit from the change.
(cherry picked from commit
d8dde13a63565dcd72bcf03a5088407b737ba793)
Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd
Fabrice Di Meglio [Wed, 28 Nov 2012 23:05:53 +0000 (15:05 -0800)]
Merge "Fix bug #
7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
Dianne Hackborn [Wed, 28 Nov 2012 23:03:39 +0000 (15:03 -0800)]
Merge "Quiet down a lot of logging." into jb-mr1.1-dev
Chris Craik [Wed, 28 Nov 2012 22:45:04 +0000 (14:45 -0800)]
Use the same interrupt/resume logic for all functor calls
bug:
7093396
The functor was able to change the renderer's blend mode without it
being restored in process mode. This single path of updating gl caches
reduces likelihood of this occurring in the future.
Change-Id: Ie367532f9c683299f02bc4f635d7cb31f96db39f
Scott Main [Wed, 28 Nov 2012 21:17:36 +0000 (13:17 -0800)]
am
23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
* commit '
23cc5d99fcb97c5a369b3ddf7f90505f6bb29363':
docs: revisions to gps landing pages
Dirk Dougherty [Wed, 28 Nov 2012 21:17:28 +0000 (13:17 -0800)]
am
f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
* commit '
f4d44618aa43b85c8a2a5bdd95e7454e2736452a':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
Scott Main [Wed, 28 Nov 2012 21:14:45 +0000 (13:14 -0800)]
Merge "docs: revisions to gps landing pages" into jb-mr1-dev
Dirk Dougherty [Wed, 28 Nov 2012 21:14:03 +0000 (13:14 -0800)]
Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
Brian Colonna [Wed, 28 Nov 2012 20:46:13 +0000 (12:46 -0800)]
Merge "Ignoring FUL unlock signal if user changed fixes b/
7572354" into jb-mr1.1-dev
Zhihai Xu [Wed, 28 Nov 2012 20:19:41 +0000 (12:19 -0800)]
Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
Fabrice Di Meglio [Wed, 28 Nov 2012 01:44:33 +0000 (17:44 -0800)]
Fix bug #
7621927 Radio button/TextView drawable regression in 4.2
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw
Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
Adam Powell [Wed, 28 Nov 2012 19:27:09 +0000 (11:27 -0800)]
Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
Scott Main [Wed, 28 Nov 2012 19:01:37 +0000 (11:01 -0800)]
docs: revisions to gps landing pages
Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b
Zhihai Xu [Wed, 28 Nov 2012 19:21:39 +0000 (11:21 -0800)]
Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
Adam Powell [Wed, 28 Nov 2012 18:46:56 +0000 (10:46 -0800)]
Clean up behavior of type arguments for MediaRouter#getSelectedRoute
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.
Behavior of getSelectedRoute is now:
* If the selected route matches at least one type with the requested
type flags, it is still considered selected for that request.
* If the caller specifically requested the selected user route and the
currently selected route is not a user route, return null.
* If the requested type flags do not match any types with the selected
route, return the default system route.
Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.
Bug
7588042
Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
Scott Main [Wed, 28 Nov 2012 18:40:18 +0000 (10:40 -0800)]
am
35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
* commit '
35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
docs: update dreamservice description
Robert Ly [Wed, 28 Nov 2012 18:11:22 +0000 (10:11 -0800)]
docs: fix bug
7628699
Change-Id: I7e8ca29910345559993cf415c2a89a21f50e4e17
Scott Main [Wed, 28 Nov 2012 18:05:30 +0000 (10:05 -0800)]
Merge "docs: update dreamservice description" into jb-mr1-dev
Andreas Huber [Wed, 28 Nov 2012 17:38:45 +0000 (09:38 -0800)]
Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 14:22:53 +0000 (06:22 -0800)]
Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
Dianne Hackborn [Wed, 28 Nov 2012 03:12:23 +0000 (19:12 -0800)]
Quiet down a lot of logging.
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).
Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
Daniel Sandler [Wed, 28 Nov 2012 02:38:32 +0000 (18:38 -0800)]
Merge "Cleanups in Notification.java." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 02:13:11 +0000 (18:13 -0800)]
Merge "Clean up the Builder test." into jb-mr1.1-dev