OSDN Git Service
Svetoslav [Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)]
Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
Jorim Jaggi [Tue, 30 Jun 2015 00:47:51 +0000 (00:47 +0000)]
Merge "Disable Keyguard chatyness" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 02:07:31 +0000 (19:07 -0700)]
Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.
bug:
22104986
Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
Jorim Jaggi [Fri, 26 Jun 2015 00:26:10 +0000 (17:26 -0700)]
Add accessibility event for assist disclosure
Bug:
21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
Jorim Jaggi [Tue, 30 Jun 2015 00:25:46 +0000 (17:25 -0700)]
Disable Keyguard chatyness
Bug:
21320918
Change-Id: I71a52b5a2f27dcf0d81710b16d9d36fc4e73ec04
Jorim Jaggi [Tue, 30 Jun 2015 00:24:34 +0000 (00:24 +0000)]
Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
Jorim Jaggi [Fri, 26 Jun 2015 23:40:00 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (1/2)
Bug:
22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
Dianne Hackborn [Tue, 30 Jun 2015 00:15:07 +0000 (00:15 +0000)]
Merge "Auto grant GET_ACCOUNTS where appropriate." into mnc-dev
Christopher Tate [Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)]
Merge "Don't crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
Santos Cordon [Mon, 29 Jun 2015 23:40:13 +0000 (23:40 +0000)]
Merge "Telecom API council changes." into mnc-dev
Tyler Gunn [Mon, 29 Jun 2015 23:31:33 +0000 (23:31 +0000)]
Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev
Santos Cordon [Thu, 25 Jun 2015 23:41:48 +0000 (16:41 -0700)]
Telecom API council changes.
- adding more javadocs.
- fixing javadoc on isEnabled
- renaming to CONFIGURE_PHONE_ACCOUNT
Bug:
21573551
Change-Id: Ice035b8573a08ea18181a73c9e9a462520a934f1
Christopher Tate [Mon, 29 Jun 2015 22:43:26 +0000 (15:43 -0700)]
Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug
22104446
Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
Shriram Ganesh [Thu, 5 Mar 2015 11:13:03 +0000 (16:43 +0530)]
IMS: Map pay phone and unknown presentation with OIR.
Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.
Bug:
22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
Jean-Michel Trivi [Mon, 29 Jun 2015 22:11:33 +0000 (22:11 +0000)]
Merge "Volume change intent carries stream alias" into mnc-dev
Yohei Yukawa [Mon, 29 Jun 2015 20:42:52 +0000 (20:42 +0000)]
Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
Yang Ni [Mon, 29 Jun 2015 20:38:05 +0000 (20:38 +0000)]
Merge "Add Java doc comments on script group name reuse" into mnc-dev
John Spurlock [Mon, 29 Jun 2015 20:08:42 +0000 (20:08 +0000)]
Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev
Alan Viverette [Mon, 29 Jun 2015 19:39:27 +0000 (19:39 +0000)]
Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
John Spurlock [Mon, 29 Jun 2015 19:34:18 +0000 (15:34 -0400)]
Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing. Otherwise nav bar navigation
will not immediately dismiss the dialog.
Bug:
22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
Christopher Tate [Mon, 29 Jun 2015 18:54:56 +0000 (18:54 +0000)]
Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev
Christopher Tate [Mon, 29 Jun 2015 18:00:15 +0000 (11:00 -0700)]
Throw DeadObjectException on failed transaction, not RuntimeException
In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight. Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.
Bug
22104446
Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
Wale Ogunwale [Mon, 29 Jun 2015 18:12:54 +0000 (18:12 +0000)]
Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev
Jean-Michel Trivi [Fri, 26 Jun 2015 00:38:35 +0000 (17:38 -0700)]
Volume change intent carries stream alias
Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be
sent along with the volume change intent, VOLUME_CHANGED_ACTION.
When sending VOLUME_CHANGED_ACTION, attach the stream type alias.
Bug
17955277
Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
Jae Seo [Mon, 29 Jun 2015 17:14:41 +0000 (17:14 +0000)]
Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
Nicolas Prevot [Mon, 29 Jun 2015 17:08:31 +0000 (17:08 +0000)]
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
Makoto Onuki [Mon, 29 Jun 2015 16:56:07 +0000 (16:56 +0000)]
Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 16:50:55 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 16:45:56 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7c3e19454b5350971e62e79804cc45512436b98
Auto-generated-cl: translation import
Jason Monk [Mon, 29 Jun 2015 16:19:46 +0000 (16:19 +0000)]
Merge "Fix weird case of multi cell icons" into mnc-dev
John Spurlock [Mon, 29 Jun 2015 15:50:49 +0000 (15:50 +0000)]
Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev
John Spurlock [Mon, 29 Jun 2015 15:42:28 +0000 (11:42 -0400)]
Volume Dialog: Fix NPE found in monkey testing.
Bug:
22116033
Change-Id: I34c586ec77bd0d2baae4e84c07afc781cda09ec3
tiger_huang [Mon, 29 Jun 2015 09:17:30 +0000 (17:17 +0800)]
Use the correct lock to protect members in PolicyControl
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.
In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.
Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
Jason Monk [Mon, 29 Jun 2015 14:57:00 +0000 (10:57 -0400)]
Fix weird case of multi cell icons
- Don't auto-inflate cell icons
- Move callback to better time (shouldn't get callbacks before
setSubs)
- Fix accidental callback in MobileSignalController constructor
- Fix subscription listener to run on the right thread to avoid
the thread issue allowing this bug
Bug:
21504138
Change-Id: Ie1adf8eb05e1042245eead5354b29b314a2e0aae
Geoff Mendal [Mon, 29 Jun 2015 13:59:37 +0000 (13:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 13:52:39 +0000 (08:52 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0a27f1d72cdcad094a9651c223f14e3a928ea2c3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 29 Jun 2015 13:41:39 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 13:40:48 +0000 (08:40 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ia1829162e64c53a9c9df9211f41bf29d4e67fd20
Auto-generated-cl: translation import
Kenny Guy [Mon, 29 Jun 2015 13:28:50 +0000 (13:28 +0000)]
Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
Kenny Guy [Mon, 29 Jun 2015 13:24:24 +0000 (13:24 +0000)]
Revert "Deprecate APIs for admin to create users."
This reverts commit
ea864c4d4d7ca390d3b67868fd2a640411bff020.
Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
Craig Lafayette [Mon, 29 Jun 2015 12:48:19 +0000 (12:48 +0000)]
Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
Kenny Guy [Mon, 29 Jun 2015 12:42:18 +0000 (12:42 +0000)]
Merge "Deprecate APIs for admin to create users." into mnc-dev
Nicolas Prevot [Mon, 29 Jun 2015 11:28:10 +0000 (11:28 +0000)]
Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev
Benjamin Franz [Mon, 29 Jun 2015 10:29:19 +0000 (10:29 +0000)]
Merge "Block assist when screenshots are disabled by policy" into mnc-dev
Niels Egberts [Mon, 29 Jun 2015 09:34:41 +0000 (09:34 +0000)]
Merge "Fix crash with engines that don't override getVoices()." into mnc-dev
Seigo Nonaka [Mon, 29 Jun 2015 03:02:42 +0000 (03:02 +0000)]
Merge "Fix crash due to reverse selection." into mnc-dev
Yang Ni [Thu, 25 Jun 2015 00:06:10 +0000 (17:06 -0700)]
Add Java doc comments on script group name reuse
b/
21999787
Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
Sanket Padawe [Sun, 28 Jun 2015 02:54:01 +0000 (02:54 +0000)]
Merge "Add flag indicating device supporting EAP SIM, AKA & AKA'." into mnc-dev
Xiaohui Chen [Sat, 27 Jun 2015 03:58:55 +0000 (03:58 +0000)]
Merge "fix temp white list update in device idle" into mnc-dev
Yohei Yukawa [Sat, 27 Jun 2015 01:02:54 +0000 (18:02 -0700)]
Check system locale when picking up an initial SpellChecker.
Since Ia25e7b4f308778891929e31b8cbd741f6848cce4, the TSMS has
picked up the first found spell checker no matter regardless of
the system locale.
The primary goal of this CL is to introduce a low-risk fix for
the situation where two or more spell checker services are
pre-installed but they are well different from each other in
terms of supported languages. Solving the problem in more
ambiguous and complicated situation is beyond the goal of
this CL.
With this CL, we still pick up the first found spell checker
but also require the spell checker supports a certain locale.
We will try several locales starting with the system locale
to some fallback locales until we find one appropriate spell
checker. If no spell checker is picked up in this process,
we simply pick up the first one as we have done.
Examples about what locales will be checked are:
A. System locale: en_US
1. en_US
2. en_GB
3. en
B. System locale: en
1. en
2. en_US
3. en_GB
C. System locale: en_IN
1. en_IN
2. en_US
3. en_GB
4. en
D. System locale: ja_JP
1. ja_JP
2. ja
3. en_US
4. en_GB
5. en
E. System locale: fil_PH
1. fil_PH
2. fil
3. en_US
4. en_GB
5. en
F. System locale: th_TH_TH
1. th_TH_TH
2. th_TH
3. th
4. en_US
5. en_GB
6. en
Bug:
22042994
Change-Id: I094f1c33430f7904a1dac6167431d6df64a07212
Christopher Tate [Sat, 27 Jun 2015 00:48:05 +0000 (00:48 +0000)]
Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev
Christopher Tate [Sat, 27 Jun 2015 00:23:32 +0000 (17:23 -0700)]
Properly scope the "only http/https schemes" intent filter semantics
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"
Bug
21688029
Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
Adam Lesinski [Sat, 27 Jun 2015 00:40:22 +0000 (00:40 +0000)]
Merge "BatteryStats: Record suspend abort reasons" into mnc-dev
Dianne Hackborn [Sat, 27 Jun 2015 00:32:36 +0000 (17:32 -0700)]
Auto grant GET_ACCOUNTS where appropriate.
And add in a few other things.
Change-Id: If86a04a8ec63c252f895dcceb60a0248abb91083
Svetoslav [Sat, 27 Jun 2015 00:32:11 +0000 (00:32 +0000)]
Merge "Update the sensors group label" into mnc-dev
Dianne Hackborn [Sat, 27 Jun 2015 00:29:18 +0000 (00:29 +0000)]
Merge "Looks like MNC is gonna be API 23." into mnc-dev
Svetoslav [Fri, 26 Jun 2015 23:50:03 +0000 (16:50 -0700)]
Update the sensors group label
bug:
21784262
Change-Id: Ib316d09d0a16df732bbb367ea6725fa08c08747d
Anil Muthineni [Fri, 26 Jun 2015 23:46:39 +0000 (23:46 +0000)]
Merge "Write size of operators in writeToParcel()" into mnc-dev
Amit Mahajan [Fri, 26 Jun 2015 23:40:44 +0000 (23:40 +0000)]
am
293facf4: (-s ours) am
ad6a2da8: am
2da8a992: am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
293facf4bf5b05c043e33589d17df6f1ad1ade26':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Xiaohui Chen [Fri, 26 Jun 2015 23:20:48 +0000 (16:20 -0700)]
fix temp white list update in device idle
It appears firewall rules for temp white list is updated differently
from the non temp one. The non temp one will trigger a global update
but the temp one is updating only the uids in the list one by one.
The individual uid firewall rule update does not work well with dozable
chain. This cl moves the dozable chain update logic out and put it where
the white list is updated.
BUG:
22094135
Change-Id: I425c82da6231b1ef119664907705d0880365f339
Anil Muthineni [Fri, 26 Jun 2015 23:31:00 +0000 (16:31 -0700)]
Write size of operators in writeToParcel()
- So that the operators are read correctly while reading
from parcel.
Bug:
21563489
Change-Id: Icb5571a261144810f075855372791d4291255eec
Amit Mahajan [Fri, 26 Jun 2015 23:26:27 +0000 (23:26 +0000)]
am
ad6a2da8: am
2da8a992: am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
ad6a2da84800e47048a8c2a83eeb343cee6aaa9c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Jorim Jaggi [Fri, 26 Jun 2015 23:24:01 +0000 (23:24 +0000)]
Merge "Don't apply existing keyguard animation to IME window" into mnc-dev
Dianne Hackborn [Fri, 26 Jun 2015 23:15:55 +0000 (16:15 -0700)]
Looks like MNC is gonna be API 23.
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
Amit Mahajan [Fri, 26 Jun 2015 23:12:05 +0000 (23:12 +0000)]
am
2da8a992: am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
2da8a992cb2afc25ac6df84da449944ea08f0c57':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 23:12:03 +0000 (23:12 +0000)]
am
1573d8ef: (-s ours) am
d98e7c1d: am
7278b043: am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
1573d8efb2ac6a1a2e2a057041200633df2a9717':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 23:06:59 +0000 (23:06 +0000)]
am
76e42bdd: am
3686e043: am
268a7c19: am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
76e42bdd05f6defa283f9df12966928328680445':
docs: manifest merger updates
Prashant Malani [Fri, 26 Jun 2015 23:06:53 +0000 (23:06 +0000)]
am
b3d02465: am
9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit '
b3d02465f859dbe62b14c787c7de966abd6c7381':
Revert "Always re-establish kernel alarms when considering new alarm set"
Robert Schaub [Fri, 26 Jun 2015 22:58:37 +0000 (22:58 +0000)]
am
cf05e318: am
2a1be1bc: Docs: Added declaration to code fragment Bug:
21030774
* commit '
cf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1':
Docs: Added declaration to code fragment Bug:
21030774
Wei Liu [Fri, 26 Jun 2015 22:58:31 +0000 (22:58 +0000)]
am
83467228: am
6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry.
* commit '
834672285050812d08cd173559382bc5c3e9800a':
Implement a exponential backoff for NTP time and XTRA data retry.
Rich Slogar [Fri, 26 Jun 2015 22:58:20 +0000 (22:58 +0000)]
am
32279219: am
fd3b64b8: am
b0afc540: docs: Eclipse ADT end-of-life note
* commit '
3227921922b3750e04e309b7cacd55d5f0b5b77d':
docs: Eclipse ADT end-of-life note
Rich Slogar [Fri, 26 Jun 2015 22:58:12 +0000 (22:58 +0000)]
am
4c96c704: am
7d377c3b: am
fa5f184f: docs: studio migration guide
* commit '
4c96c7045e7e4efbf4f7b68f8e3d02a5e9272075':
docs: studio migration guide
Sanket Padawe [Fri, 26 Jun 2015 22:57:07 +0000 (15:57 -0700)]
Add flag indicating device supporting EAP SIM, AKA & AKA'.
Bug:
22014309
Change-Id: Ia76507f9fbe607a7cbec126c527840806c0e7851
Amit Mahajan [Fri, 26 Jun 2015 22:55:47 +0000 (22:55 +0000)]
am
d98e7c1d: am
7278b043: am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:55:18 +0000 (22:55 +0000)]
am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
b98f786c8acfaed27ee733dde0aa0fd255a09afc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Svet Ganov [Fri, 26 Jun 2015 22:52:53 +0000 (22:52 +0000)]
Merge "Make grant default permission more robust." into mnc-dev
Svet Ganov [Fri, 26 Jun 2015 17:54:06 +0000 (10:54 -0700)]
Make grant default permission more robust.
Change-Id: If492ee3305774419671bbdb72b438c8e540005e9
Robert Greenwalt [Fri, 26 Jun 2015 22:40:29 +0000 (22:40 +0000)]
Merge "Add Validation logging." into mnc-dev
Mady Mellor [Fri, 26 Jun 2015 22:36:42 +0000 (22:36 +0000)]
Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
Rubin Xu [Fri, 26 Jun 2015 22:36:09 +0000 (22:36 +0000)]
Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
Amit Mahajan [Fri, 26 Jun 2015 22:35:46 +0000 (22:35 +0000)]
am
7278b043: am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
7278b04383cb6c01c2fbb184c560875ab709dea5':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:34:59 +0000 (22:34 +0000)]
am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
5b8976a5eaffe81a742ec2600cf9b63e911f978c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 22:34:49 +0000 (22:34 +0000)]
am
3686e043: am
268a7c19: am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
3686e0430f8366e2f4de867eeabfd1b7fe4aefc0':
docs: manifest merger updates
Abodunrinwa Toki [Fri, 26 Jun 2015 22:32:25 +0000 (22:32 +0000)]
Merge "TextView: add the "Share" accessibility action." into mnc-dev
Jorim Jaggi [Thu, 25 Jun 2015 22:29:54 +0000 (15:29 -0700)]
Don't apply existing keyguard animation to IME window
Low risk fix, but it remains unclear what the underlying cause is.
This also applies keyguard exit animation to windows on the default
display.
Bug:
21788383
Bug:
22096813
Change-Id: I37dd4b18483c1103f5f2817f4879f080a38bceca
Rich Slogar [Fri, 26 Jun 2015 22:25:35 +0000 (22:25 +0000)]
am
268a7c19: am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
268a7c190c37a7a63bd1134c4dfb8aacf71c211e':
docs: manifest merger updates
Amit Mahajan [Fri, 26 Jun 2015 22:19:29 +0000 (22:19 +0000)]
am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:18:01 +0000 (22:18 +0000)]
am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
895eb134751ec1495baa30362a514275624e5843':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 22:11:44 +0000 (22:11 +0000)]
am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
fc7e84b36b77ac95e61bd1736eebdc307ba6e09e':
docs: manifest merger updates
Abodunrinwa Toki [Fri, 26 Jun 2015 22:09:40 +0000 (22:09 +0000)]
Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
Chien-Yu Chen [Fri, 26 Jun 2015 22:09:28 +0000 (22:09 +0000)]
Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 04:33:51 +0000 (21:33 -0700)]
Fix FloatingToolbar flicker in reaction to text cursor blink.
1. Reposition the toolbar on predraw only when positioning has changed.
2. Update the toolbar popup's position only if the content rect changed.
3. Fix FloatingToolbarPopup.cancelOverflowAnimations().
The previous implementation wasn't actually cancelling the animation.
(1) is enough to fix the bug. But (2) and (3) fix issues in the
toolbar directly related to this bug.
Bug:
22039189
Change-Id: I84ec793d788f9402a1f8635e68e3344746f6af07
Chien-Yu Chen [Fri, 26 Jun 2015 22:05:03 +0000 (22:05 +0000)]
Merge "Camera2: Clarify session callbacks" into mnc-dev
Amit Mahajan [Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)]
am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:03:10 +0000 (22:03 +0000)]
am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 21:56:23 +0000 (21:56 +0000)]
Merge "docs: manifest merger updates" into lmp-docs
Jae Seo [Thu, 25 Jun 2015 23:55:04 +0000 (16:55 -0700)]
Use AlertDialog for MediaRouteControllerDialog
Bug:
19876497, Bug:
21795195, Bug:
22044600
Change-Id: I8ec3b17d026b2690edad4b5c4d61741e29b653db
Nathan Harold [Fri, 26 Jun 2015 21:47:05 +0000 (21:47 +0000)]
Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
Shirish Kalele [Fri, 26 Jun 2015 21:34:22 +0000 (21:34 +0000)]
Merge "Mark a connection as a Wifi Assistant connection based on the ephemeral flag in WifiInfo. Add this private field to WifiInfo." into mnc-dev
Jorim Jaggi [Thu, 25 Jun 2015 22:55:43 +0000 (15:55 -0700)]
Also reset assist setting when force stopping assist
Bug:
20882522
Change-Id: I57725586ab5ff203b378a1e6d2e5e77a47fd2448