OSDN Git Service
Raph Levien [Fri, 14 Nov 2014 20:53:11 +0000 (20:53 +0000)]
Merge "Update hint text color even when text present" into lmp-mr1-dev
Raph Levien [Fri, 14 Nov 2014 20:51:55 +0000 (20:51 +0000)]
Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
Jeff Sharkey [Fri, 14 Nov 2014 19:24:51 +0000 (19:24 +0000)]
Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
smain@google.com [Fri, 14 Nov 2014 19:06:43 +0000 (19:06 +0000)]
am
04b393a8: am
d35b8587: am
5e5af93b: remove preview system image links bug:
18376658
* commit '
04b393a812bbbe9975df6e7d20514c797398d571':
remove preview system image links bug:
18376658
Jeff Sharkey [Fri, 14 Nov 2014 00:20:38 +0000 (16:20 -0800)]
Block loading WebView in privileged processes.
WebView is very powerful, but it also has a large attack area. To
improve security, refuse to load WebView components when running as
the root or system UIDs.
Bug:
18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
smain@google.com [Fri, 14 Nov 2014 19:00:09 +0000 (19:00 +0000)]
am
d35b8587: am
5e5af93b: remove preview system image links bug:
18376658
* commit '
d35b858706ab7d7ec4685fa384ca3cd42d1ec316':
remove preview system image links bug:
18376658
smain@google.com [Fri, 14 Nov 2014 18:53:39 +0000 (18:53 +0000)]
am
5e5af93b: remove preview system image links bug:
18376658
* commit '
5e5af93b962c5ec97f7c2b841d4e9076904dd544':
remove preview system image links bug:
18376658
Yin-Chia Yeh [Fri, 14 Nov 2014 18:36:32 +0000 (18:36 +0000)]
Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
smain@google.com [Fri, 14 Nov 2014 18:12:53 +0000 (10:12 -0800)]
remove preview system image links
bug:
18376658
Change-Id: I5f0e79e4261a004a84a09c0095d77f985abdf868
Eric Laurent [Fri, 14 Nov 2014 17:42:45 +0000 (17:42 +0000)]
Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev
Winson Chung [Fri, 14 Nov 2014 17:32:28 +0000 (17:32 +0000)]
Merge "Fixing crash in querying the task stack from a fresh load plan. (Bug
18371946)" into lmp-mr1-dev
Fyodor Kupolov [Fri, 14 Nov 2014 17:26:05 +0000 (17:26 +0000)]
Merge "Added synchronization to handlePackagesChanged method" into lmp-mr1-dev
Ye Wen [Fri, 14 Nov 2014 17:22:10 +0000 (17:22 +0000)]
Merge "Delay connecting to MmsService until APIs are called for imms" into lmp-mr1-dev
Craig Mautner [Fri, 14 Nov 2014 16:31:20 +0000 (16:31 +0000)]
am
33d92c56: Use package name as custom resolver process name
* commit '
33d92c56781f6058c9e682737a06c41f3a2d2f3a':
Use package name as custom resolver process name
Craig Mautner [Fri, 14 Nov 2014 00:17:17 +0000 (16:17 -0800)]
Use package name as custom resolver process name
The process name was being assigned null. This meant that after the
process attached we weren't matching the name in
ActivityStackSupervisor.attachApplicationLocked(). That meant missing
the call to realStartActivityLocked() and then the resolver didn't
start until window manager timed out and resumeTopActivity was
called five seconds later.
Fixes bug
18301267.
Change-Id: If3721caeebb309c6054150b2f707e3d6e38a74d2
Jason Monk [Fri, 14 Nov 2014 14:50:01 +0000 (14:50 +0000)]
Merge "SysUI: Add basic test coverage for signal levels" into lmp-mr1-dev
Esteban Talavera [Fri, 31 Oct 2014 15:41:12 +0000 (15:41 +0000)]
New AccountManager method to copy accounts between users.
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.
Also an extra in the public api to identify the account to migrate
during provisioning.
Bug:
17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
Sander Alewijnse [Fri, 14 Nov 2014 10:26:35 +0000 (10:26 +0000)]
Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
Mark Renouf [Fri, 14 Nov 2014 02:14:29 +0000 (02:14 +0000)]
am
cd22c3d6: Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
* commit '
cd22c3d67c98a6ac98291c3337e6506546e771be':
Sets windowOverscan for all Wear DeviceDefault themes.
Mark Renouf [Fri, 14 Nov 2014 02:04:29 +0000 (02:04 +0000)]
Merge "Sets windowOverscan for all Wear DeviceDefault themes." into lmp-sprout-dev
Alan Viverette [Fri, 14 Nov 2014 01:52:14 +0000 (01:52 +0000)]
Merge "Ignore accessibility overlays during visible window computation" into lmp-mr1-dev
Alan Viverette [Fri, 14 Nov 2014 01:52:12 +0000 (01:52 +0000)]
Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev
Alan Viverette [Fri, 14 Nov 2014 01:45:56 +0000 (01:45 +0000)]
Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
Sarah Maddox [Fri, 14 Nov 2014 00:21:14 +0000 (00:21 +0000)]
am
f21e7d31: am
aa3a93ed: am
67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '
f21e7d31582b404e479d9a594f192e67e2b95d8f':
docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
Mark Renouf [Thu, 13 Nov 2014 23:58:59 +0000 (18:58 -0500)]
Sets windowOverscan for all Wear DeviceDefault themes.
Without this flag, window insets will be consumed by the first View
which does not explicitly override onApplyWindowInsets. This is either
SwipeDismissLayout or the content view of the activity (if swipeDismiss
is not enabled).
BUG:
18376451
Change-Id: I5e590bad9810a9a232a6c318f715d587a3290f34
Sarah Maddox [Fri, 14 Nov 2014 00:09:12 +0000 (00:09 +0000)]
am
aa3a93ed: am
67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '
aa3a93ede76b46ef6ca0daa18ca9a6cd77c26f66':
docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
Sarah Maddox [Fri, 14 Nov 2014 00:02:38 +0000 (00:02 +0000)]
am
67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '
67b0ac719a87ba52c849a6cf055ef235f230dd6e':
docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
Sarah Maddox [Thu, 13 Nov 2014 23:57:29 +0000 (23:57 +0000)]
Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
Alan Viverette [Thu, 13 Nov 2014 23:14:36 +0000 (15:14 -0800)]
Set current degrees when updating RotateDrawable from typed array
This regressed after enabling theming in RotateDrawable.
BUG:
18288235
Change-Id: I61a7b2c178253ed2d550fa0636e27e021ac9eb64
Alan Viverette [Thu, 13 Nov 2014 22:49:20 +0000 (14:49 -0800)]
Ignore accessibility overlays during visible window computation
Previously, the conditional for checking the layer type before
accounting for the window bounds was incorrectly inverted, but
we can simplify by just skipping accessibility overlay windows
completely.
BUG:
18358878
BUG:
18359820
BUG:
18359788
Change-Id: I9ba1e43a0fef4fa40693bd8c7e883c2ef45b4c4d
Chris Craik [Thu, 13 Nov 2014 22:46:20 +0000 (22:46 +0000)]
Merge "Add offset method to Outline" into lmp-mr1-dev
Alan Viverette [Thu, 13 Nov 2014 22:45:10 +0000 (22:45 +0000)]
Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
Alan Viverette [Thu, 13 Nov 2014 22:44:11 +0000 (22:44 +0000)]
Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev
ztenghui [Thu, 13 Nov 2014 22:41:53 +0000 (22:41 +0000)]
Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev
Nick Kralevich [Thu, 13 Nov 2014 22:37:01 +0000 (22:37 +0000)]
Merge "fix crash on invalid base64 key" into lmp-mr1-dev
kmccormick [Thu, 13 Nov 2014 22:34:03 +0000 (22:34 +0000)]
am
90bdbe8c: am
30aee7fc: am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
90bdbe8c999df88330b28daa492eeb4425863dab':
Doc update: new reg error code + snippet
Winson Chung [Thu, 13 Nov 2014 22:30:26 +0000 (14:30 -0800)]
Fixing crash in querying the task stack from a fresh load plan. (Bug
18371946)
kmccormick [Thu, 13 Nov 2014 22:29:45 +0000 (22:29 +0000)]
am
30aee7fc: am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
30aee7fccbbcbdd09ca9393636316813e222ba62':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:24:44 +0000 (22:24 +0000)]
am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
feb1347b2b411be03c640e8d61bfc3b428932e31':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:21:01 +0000 (22:21 +0000)]
Merge "Doc update: new reg error code + snippet" into lmp-docs
Jeff Sharkey [Thu, 13 Nov 2014 22:16:14 +0000 (22:16 +0000)]
Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
Abhijith Shastry [Thu, 13 Nov 2014 22:15:44 +0000 (22:15 +0000)]
Merge "new sms/mms carrier app API" into lmp-mr1-dev
Alan Viverette [Thu, 13 Nov 2014 22:04:32 +0000 (14:04 -0800)]
Make indeterminate progress alpha consistent with determinate
Both should match the default disabledAlpha for controls.
BUG:
15900514
Change-Id: Ie7c801bc208a14f14926d38b462f49d1f91b28d0
Jeff Sharkey [Wed, 12 Nov 2014 18:39:56 +0000 (10:39 -0800)]
Move ringtone redirection to MediaPlayer.
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.
With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.
To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.
Bug:
18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
Alan Viverette [Thu, 13 Nov 2014 20:59:37 +0000 (12:59 -0800)]
Don't dismiss AutoCompleteTextView on focus change while temp detached
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.
BUG:
18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
Geoff Mendal [Thu, 13 Nov 2014 20:58:23 +0000 (20:58 +0000)]
am
4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
4cc7bbc9fd937c6f25962fd6971e77773114aff2':
Import translations. DO NOT MERGE
Jeff Brown [Thu, 13 Nov 2014 20:58:19 +0000 (20:58 +0000)]
am
24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
* commit '
24c1d664c4f95a8c997bfc4683844e05b788c3db':
Remove an unnecessary condition from previous change.
Jeff Brown [Thu, 13 Nov 2014 20:58:15 +0000 (20:58 +0000)]
am
1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
* commit '
1cbff0e310b0fba6b25ca1c1e14eaefeabdee0d9':
Improve screen brightness boost behavior.
Renato Mangini [Thu, 13 Nov 2014 20:58:03 +0000 (20:58 +0000)]
am
ee291ca2: am
6f41522d: am
c9fc837f: Add new samples to what\'s new page.
* commit '
ee291ca2ce4092aaae556ebda46daf7337506f74':
Add new samples to what's new page.
ztenghui [Thu, 13 Nov 2014 00:19:03 +0000 (16:19 -0800)]
Fix the starting pen's position when a path close.
We have to cache the starting point for the latest "move", then apply it after
we close the path.
b/
18214929
Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
Raph Levien [Thu, 13 Nov 2014 20:36:49 +0000 (12:36 -0800)]
Fudge clipRect in TextView for extra cursor width
There are a number of cases (most commonly cursor at start of line in
RTL direction) where the cursor extends past the right edge of the
clipRect. This patch adds approximately 1dp on the right side of the
clip, so that the cursor doesn't get clipped.
Bug:
18035274
Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
John Spurlock [Thu, 13 Nov 2014 20:20:23 +0000 (20:20 +0000)]
Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
Jeff Sharkey [Thu, 13 Nov 2014 20:17:30 +0000 (20:17 +0000)]
Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
Jeff Sharkey [Thu, 13 Nov 2014 20:13:53 +0000 (12:13 -0800)]
Make package verifier broadcasts foreground.
We're using ordered broadcasts (sigh!) for package verification, and
we could be stuck behind dozens of other background broadcasts, so
hoist into foreground queue.
Bug:
18356768
Change-Id: Ib4abf771db0147f8fbd7227f32297602816c84ae
Yin-Chia Yeh [Wed, 12 Nov 2014 19:42:49 +0000 (11:42 -0800)]
Camera: doc update for independent 3A
Bug:
18281970
Change-Id: I12f8b4fcbabe473b076464eaf9b7617a5ec586d3
Simranjit Singh Kohli [Thu, 13 Nov 2014 19:18:28 +0000 (19:18 +0000)]
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
Wale Ogunwale [Thu, 13 Nov 2014 19:00:05 +0000 (19:00 +0000)]
Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
Jean-Michel Trivi [Thu, 13 Nov 2014 18:47:32 +0000 (18:47 +0000)]
Merge "Support for delayed audio focus" into lmp-mr1-dev
Sander Alewijnse [Wed, 12 Nov 2014 18:03:11 +0000 (18:03 +0000)]
Add extra to enable device admins to skip removal of system apps.
Bug:
17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
Jon Eklund [Thu, 13 Nov 2014 15:57:17 +0000 (09:57 -0600)]
AudioRecorder read buffer overflow
Since function was changed from byte-native to short-native,
it's no longer necessary to multiply offset by sizeof(short).
Bug
18367580
Change-Id: I669d860334ba40e46c04e534d7008b9e2401d8cd
Adam Powell [Thu, 13 Nov 2014 18:12:52 +0000 (18:12 +0000)]
Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
RoboErik [Thu, 13 Nov 2014 17:55:05 +0000 (17:55 +0000)]
Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev
Mike Lockwood [Thu, 13 Nov 2014 17:52:00 +0000 (17:52 +0000)]
Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev
Mike Lockwood [Thu, 13 Nov 2014 17:40:42 +0000 (09:40 -0800)]
MTP: Update JNI for new packet getters
Bug:
18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
Jorim Jaggi [Thu, 13 Nov 2014 17:02:16 +0000 (17:02 +0000)]
Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev
Jorim Jaggi [Tue, 11 Nov 2014 21:51:10 +0000 (22:51 +0100)]
Fix doze jank by removing a fullscreen layer of overdraw
Move all doze related stuff into DozeScrimController, and combine
both alpha values from the regular ScrimController and
DozeScrimController before applying it to a view. Move the black
background from NotificationPanelView to DozeScrimController, which
saves a fullscreen layer of overdraw during the transition.
Bug:
18238168
Change-Id: Ifb133bf4a0f8255f5c2f5e205509af339cac8c8f
Jorim Jaggi [Thu, 13 Nov 2014 16:46:54 +0000 (16:46 +0000)]
Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev
Craig Mautner [Thu, 13 Nov 2014 00:55:53 +0000 (00:55 +0000)]
Revert "Debug for bug
18017409"
The bug has been fixed. No longer needed.
This reverts commit
5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.
Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
Jorim Jaggi [Tue, 11 Nov 2014 22:16:28 +0000 (23:16 +0100)]
Fix wrong states when waking up from doze via touch
Bug:
18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
John Spurlock [Wed, 12 Nov 2014 14:16:49 +0000 (09:16 -0500)]
Zen: Update condition text for current condition.
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.
Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).
Also, clear the fired-alarm cache on time or time-zone resets.
Bug:
16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
Alexandra Gherghina [Thu, 13 Nov 2014 15:31:09 +0000 (15:31 +0000)]
Merge "Update current.txt with the new extra" into lmp-mr1-dev
Ignacio Solla [Thu, 13 Nov 2014 15:03:43 +0000 (15:03 +0000)]
Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
Alexandra Gherghina [Thu, 13 Nov 2014 14:43:02 +0000 (14:43 +0000)]
Update current.txt with the new extra
Bug:
17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
Alexandra Gherghina [Thu, 13 Nov 2014 13:59:32 +0000 (13:59 +0000)]
Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
Alexandra Gherghina [Thu, 13 Nov 2014 12:46:15 +0000 (12:46 +0000)]
Add extra for account migration in the DevicePolicyMamager
This is in preparation for the implementation CL
Bug:
17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
Geoff Mendal [Thu, 13 Nov 2014 09:43:50 +0000 (09:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 13 Nov 2014 09:41:27 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Narayan Kamath [Thu, 13 Nov 2014 09:33:07 +0000 (09:33 +0000)]
Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
Geoff Mendal [Thu, 13 Nov 2014 07:20:52 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
Jeff Brown [Thu, 13 Nov 2014 07:11:35 +0000 (07:11 +0000)]
Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
Jeff Brown [Thu, 13 Nov 2014 07:04:53 +0000 (07:04 +0000)]
Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
Jeff Brown [Thu, 13 Nov 2014 07:01:12 +0000 (23:01 -0800)]
Remove an unnecessary condition from previous change.
Change-Id: Ib966fbb373294ad60caf7f1d9cbb7fafd05ded6b
Jeff Brown [Thu, 13 Nov 2014 06:58:01 +0000 (06:58 +0000)]
Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
Geoff Mendal [Thu, 13 Nov 2014 05:07:02 +0000 (21:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b1c0b5c7530c8733d15551bb11211fa3e5585df
Auto-generated-cl: translation import
Renato Mangini [Thu, 13 Nov 2014 04:05:00 +0000 (04:05 +0000)]
am
6f41522d: am
c9fc837f: Add new samples to what\'s new page.
* commit '
6f41522d6847afa5bb7ce1cff2a64ec7e9f18ecf':
Add new samples to what's new page.
Renato Mangini [Thu, 13 Nov 2014 03:54:11 +0000 (03:54 +0000)]
am
c9fc837f: Add new samples to what\'s new page.
* commit '
c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
Add new samples to what's new page.
Renato Mangini [Thu, 13 Nov 2014 02:55:06 +0000 (18:55 -0800)]
Add new samples to what's new page.
Also reverted the order on the page to show most recent samples first.
Bug:
18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
Jeff Brown [Thu, 13 Nov 2014 02:45:31 +0000 (18:45 -0800)]
Improve screen brightness boost behavior.
Wake-up when entering brightness boost mode, don't boost in ambient
mode since some display device drivers do strange things in that mode and
boost doesn't work. Waking up feels more natural as well.
Don't flutter the power HAL's interactive mode bit simply due to changes
in display ready state since that may result in visible artifacts
such as display flashes.
Don't stop the auto-brightness sensor while temporarily boosted.
Don't prevent the display from entering the ready state while in brightness
boost since that would unnecessarily delay the transition from DOZING to AWAKE
until boost is finished.
Restart the user activity timeout when brightness boost ends and prevent
the display from dimming while boosted.
The pixel fairies basked in the sunlight.
Bug:
18262044
Bug:
18261782
Change-Id: I8c42a1e6091b0fe1253e90265ac248087ebc24e1
Sarah Maddox [Tue, 11 Nov 2014 22:21:41 +0000 (09:21 +1100)]
docs: Clarifies the difference between the Android framework location APIs
and the Google Play services location APIs.
Fixes 80-character line length.
Bug:
18080006
Change-Id: I463e0bfe47e9113af2ce4e03806d25e082a9b285
Andrew Lee [Thu, 13 Nov 2014 02:15:13 +0000 (02:15 +0000)]
Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev
Yorke Lee [Thu, 13 Nov 2014 00:50:00 +0000 (00:50 +0000)]
Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev
xinhe [Thu, 13 Nov 2014 00:37:58 +0000 (00:37 +0000)]
Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev
Adam Lesinski [Thu, 13 Nov 2014 00:32:59 +0000 (00:32 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
Chris Craik [Wed, 12 Nov 2014 19:45:47 +0000 (11:45 -0800)]
Add offset method to Outline
Also clean up offset docs in Path
Change-Id: Ieca02611d32acce726efba652ae1969340a55a76
Chris Craik [Thu, 13 Nov 2014 00:05:56 +0000 (00:05 +0000)]
Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev
Dianne Hackborn [Thu, 13 Nov 2014 00:03:51 +0000 (00:03 +0000)]
Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
xinhe [Fri, 7 Nov 2014 23:14:24 +0000 (15:14 -0800)]
Update enabe/disableCellBroadcast with RAN argument
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.
Bug:
18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
Andrew Lee [Wed, 12 Nov 2014 23:47:02 +0000 (15:47 -0800)]
Add telephony.DisconnectCause for merged IMS call.
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.
We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).
Bug:
18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
Renato Mangini [Wed, 12 Nov 2014 23:47:14 +0000 (23:47 +0000)]
am
5d7f91c7: am
40ac90e9: am
1b657d92: Fix the order of sample categories left nav.
* commit '
5d7f91c77605a5c444eaaae2b812280c57ca244c':
Fix the order of sample categories left nav.
Geoff Mendal [Wed, 12 Nov 2014 23:41:57 +0000 (23:41 +0000)]
am
2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
2d28d697f6235c497237a11abb973b9109999e38':
Import translations. DO NOT MERGE