OSDN Git Service
Wink Saville [Wed, 17 Dec 2014 22:38:49 +0000 (14:38 -0800)]
Update mapping between RAF and Network Type.
bug:
18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
Wink Saville [Fri, 19 Dec 2014 17:58:50 +0000 (17:58 +0000)]
Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
Eric Laurent [Fri, 19 Dec 2014 17:11:27 +0000 (17:11 +0000)]
Merge "AudioService: fix permission check." into lmp-mr1-dev
Jason Monk [Fri, 19 Dec 2014 14:55:47 +0000 (14:55 +0000)]
Merge "Fix missing subscription list changes" into lmp-mr1-dev
Oliver Woodman [Fri, 19 Dec 2014 11:37:01 +0000 (11:37 +0000)]
Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
Lorenzo Colitti [Wed, 17 Dec 2014 02:26:49 +0000 (11:26 +0900)]
Add a lastValidated bit and use it when reporting capabilities.
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.
Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().
Bug:
18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
Lorenzo Colitti [Wed, 17 Dec 2014 02:14:42 +0000 (11:14 +0900)]
Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.
Bug:
18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
Eric Laurent [Fri, 19 Dec 2014 01:38:04 +0000 (17:38 -0800)]
AudioService: fix permission check.
Clear caller identity before calling TelecomManager.isInCall().
Bug:
18702149.
Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
Jean-Michel Trivi [Thu, 18 Dec 2014 23:04:25 +0000 (15:04 -0800)]
MediaSessionLegacyHelper uses global Application context
MediaSessionLegacyHelper used a Context passed by an application
which can cause a leak of Activity instances. Use the global
Application context instead.
Also prevent crash if a null Context is supplied (method not
documented as requesting a non-null Context).
Bug
18767503
Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
xinhe [Fri, 19 Dec 2014 00:07:28 +0000 (00:07 +0000)]
Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev
Mike Lockwood [Thu, 18 Dec 2014 22:33:59 +0000 (22:33 +0000)]
Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
Mike Lockwood [Thu, 18 Dec 2014 22:16:36 +0000 (14:16 -0800)]
BluetoothManagerService: Enforce DUMP permission
Bug:
18667272
Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
vandwalle [Thu, 18 Dec 2014 22:16:29 +0000 (22:16 +0000)]
Merge "add debug logs to confirm network flapping issue is fixed Bug:
18706288" into lmp-mr1-dev
Craig Mautner [Thu, 18 Dec 2014 19:55:49 +0000 (19:55 +0000)]
Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
Winson Chung [Thu, 18 Dec 2014 19:30:38 +0000 (19:30 +0000)]
Merge "Bug
18784289: Fix issue with transition animation callback." into lmp-mr1-dev
Winson Chung [Wed, 17 Dec 2014 18:12:54 +0000 (10:12 -0800)]
Bug
18784289: Fix issue with transition animation callback.
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback. This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.
Bug:
18784289
Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
Jason Monk [Mon, 15 Dec 2014 17:24:10 +0000 (12:24 -0500)]
Fix missing subscription list changes
A missing @Override let the wrong function try to catch changes
to the subscription list.
The SubscriptionManager returns null when no SIMs are in the device,
so handle null as an empty list of subscriptions.
Bug:
18752587
Change-Id: I20ee1bde3f23828860f57b512662ad54ee51baf0
xinhe [Thu, 18 Dec 2014 18:02:14 +0000 (10:02 -0800)]
take out SIM card, the RSSI Triangle is still full
Bug:
18479509
Change-Id: I96b0e91ae42ad222889c123ebe0c0c1225d9b6a7
Michael Runge [Thu, 18 Dec 2014 01:49:06 +0000 (01:49 +0000)]
Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 01:33:53 +0000 (01:33 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
automerge:
85e645a
* commit '
85e645ac2bf38186dce177e29f7062a3645c7917':
docs: sdk revision 24.0.2
Eric Gilmore [Thu, 18 Dec 2014 01:32:41 +0000 (01:32 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
automerge:
8d2af0f
* commit '
8d2af0f9daf672183262a226e9c9410c54c133a2':
Adding links for the last few files requested by PMs.
Pavel Zhamaitsiak [Thu, 18 Dec 2014 01:27:36 +0000 (01:27 +0000)]
Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev
Rich Slogar [Thu, 18 Dec 2014 00:58:03 +0000 (00:58 +0000)]
am
879cffde: am
8838a9f0: docs: sdk revision 24.0.2
* commit '
879cffdec9c6206a3d1f3babfef2b2940a72bfa2':
docs: sdk revision 24.0.2
Rich Slogar [Thu, 18 Dec 2014 00:51:56 +0000 (00:51 +0000)]
am
8838a9f0: docs: sdk revision 24.0.2
* commit '
8838a9f083ff2ecc748d70931e21cbd429ad0d45':
docs: sdk revision 24.0.2
Sanket Padawe [Thu, 18 Dec 2014 00:44:06 +0000 (00:44 +0000)]
Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev
Rich Slogar [Tue, 16 Dec 2014 00:58:03 +0000 (16:58 -0800)]
docs: sdk revision 24.0.2
Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
vandwalle [Mon, 15 Dec 2014 23:41:34 +0000 (15:41 -0800)]
add debug logs to confirm network flapping issue is fixed
Bug:
18706288
Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
Winson Chung [Thu, 18 Dec 2014 00:15:11 +0000 (00:15 +0000)]
Merge "Removing context ref from AppWidgetHost. (Bug
18769791)" into lmp-mr1-dev
Eric Gilmore [Thu, 18 Dec 2014 00:08:10 +0000 (00:08 +0000)]
am
41ea13c8: am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
41ea13c8d2e350bb6167b79653f2aa65fa5d84c5':
Adding links for the last few files requested by PMs.
Amit Mahajan [Wed, 17 Dec 2014 23:58:09 +0000 (23:58 +0000)]
Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
Eric Gilmore [Wed, 17 Dec 2014 23:56:21 +0000 (23:56 +0000)]
am
fe7b93f4: Adding links for the last few files requested by PMs.
* commit '
fe7b93f4f7fec93650d3faec23f9cf76841d2b9e':
Adding links for the last few files requested by PMs.
Eric Gilmore [Wed, 17 Dec 2014 23:25:51 +0000 (15:25 -0800)]
Adding links for the last few files requested by PMs.
Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
Craig Mautner [Wed, 17 Dec 2014 23:45:03 +0000 (15:45 -0800)]
Make window mgr stack movement track activity mgr
There were situations where the activity manager ActivityStack was
moved to the front but the corresponding window manager TaskStack
was not. This caused the wrong activity to receive focus which led
to Application Not Responding errors.
One path in particular occurred in startActivityUncheckedLocked()
where curTop.task != intentActivity.task and
sourceStack.topActivity().task != sourceRecord.task. In this case
targetStack.moveTaskToFrontLocked() was never called.
This fix forces all calls to ActivityStack.moveToFront() to make
a call to WindowManagerService.moveTaskToTop() and eliminates
redundant calls to moveTaskToTop().
Fixes bug
17721767.
Change-Id: Ibf01389810dd36724eaec5a4a07560144b2f4cef
Amit Mahajan [Wed, 17 Dec 2014 23:42:56 +0000 (15:42 -0800)]
Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.
Bug:
18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
Raph Levien [Wed, 17 Dec 2014 23:08:49 +0000 (23:08 +0000)]
Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 23:04:15 +0000 (23:04 +0000)]
Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
Raph Levien [Wed, 17 Dec 2014 22:31:39 +0000 (14:31 -0800)]
Revert "Change Linkify leniency to VALID"
This reverts commit
9dfe86d4102b93885b947917fccee35053cfc9f2.
That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).
The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.
Bug:
18708556
Sanket Padawe [Wed, 17 Dec 2014 22:19:58 +0000 (14:19 -0800)]
Removing unwanted tethering profiles from config.xml
Bug:
18769044
Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
Chris Craik [Wed, 17 Dec 2014 22:07:02 +0000 (22:07 +0000)]
Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev
Jinsuk Kim [Wed, 17 Dec 2014 21:15:18 +0000 (21:15 +0000)]
Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
Anju Mathapati [Wed, 17 Dec 2014 19:11:21 +0000 (11:11 -0800)]
IMS: Set phone account in IMS Conference object
Get phone account from conference host connection and set
it to ImsConference while constructing
Bug:
18690773
Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
Jeff Davidson [Wed, 17 Dec 2014 20:51:09 +0000 (20:51 +0000)]
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
Cheuksan Wang [Wed, 17 Dec 2014 20:38:06 +0000 (20:38 +0000)]
Merge "remove actions and calls for the old sms/mms api BUG:
18005911" into lmp-mr1-dev
John Spurlock [Wed, 17 Dec 2014 20:13:00 +0000 (20:13 +0000)]
Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
smain@google.com [Wed, 17 Dec 2014 19:57:42 +0000 (19:57 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs automerge:
b834c72
automerge:
2a53e24
* commit '
2a53e24e10654b7f5667899c8a110ef6742c79e3':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Chris Craik [Wed, 17 Dec 2014 19:10:28 +0000 (11:10 -0800)]
Revert overdraw avoidance visualization change
bug:
18787324
Partial revert of
23d307c8d88f4a3849163b9e5b7cd11d0d4f372c.
Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
Winson Chung [Wed, 17 Dec 2014 18:31:22 +0000 (10:31 -0800)]
Removing context ref from AppWidgetHost. (Bug
18769791)
Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
Jorim Jaggi [Wed, 17 Dec 2014 18:59:38 +0000 (18:59 +0000)]
Merge "Fix colored icons in doze mode" into lmp-mr1-dev
Jorim Jaggi [Tue, 16 Dec 2014 18:44:41 +0000 (19:44 +0100)]
Fix colored icons in doze mode
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.
Bug:
18537470
Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
Nicolas Prevot [Wed, 17 Dec 2014 18:54:53 +0000 (18:54 +0000)]
Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
Paul Jensen [Wed, 17 Dec 2014 18:34:55 +0000 (18:34 +0000)]
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
smain@google.com [Wed, 17 Dec 2014 18:03:39 +0000 (18:03 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
automerge:
b834c72
* commit '
b834c72e61943fda18153bb42b3c8bd80d604b0b':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
smain@google.com [Wed, 17 Dec 2014 17:59:00 +0000 (17:59 +0000)]
am
48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
* commit '
4842228377a292698b232f18706ce54cb7f7cc32':
make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145
Nicolas Prevot [Wed, 17 Dec 2014 15:28:29 +0000 (15:28 +0000)]
Fix the doc of addCrossProfileIntentFilter.
Mention that cross-profile-intent-filters only work for activity intents.
BUG:
18776618
Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
smain@google.com [Wed, 17 Dec 2014 17:52:07 +0000 (17:52 +0000)]
Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug:
18721145" into lmp-docs
smain@google.com [Wed, 17 Dec 2014 17:50:26 +0000 (09:50 -0800)]
make hidden text hidden with negative indent to avoid horizontal scroll
bug:
18721145
Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
Geoff Mendal [Wed, 17 Dec 2014 17:45:09 +0000 (17:45 +0000)]
Import translations. DO NOT MERGE
automerge:
43741a8 -s ours
* commit '
43741a8c8371e3a473794cc2d2a81dda777e8724':
Import translations. DO NOT MERGE
Christoph Studer [Wed, 17 Dec 2014 17:43:33 +0000 (17:43 +0000)]
am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
automerge:
4328588
* commit '
4328588cb532571c3b11867048d0972ff2e4d969':
Fix MediaStyle docs mentioning 2 max actions in compact view
Joe Fernandez [Wed, 17 Dec 2014 17:42:19 +0000 (17:42 +0000)]
am
6ff265cc: am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs
automerge:
ca27fb9
* commit '
ca27fb9711f24df8b88a41c8a360f57c7252ba79':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 17:40:58 +0000 (17:40 +0000)]
am
f9ea93cd: am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
automerge:
e479dc2
* commit '
e479dc219ff4d289105e32264c1fa66187aa5555':
docs: studio tools help monkey update
Joe Fernandez [Wed, 17 Dec 2014 17:39:45 +0000 (17:39 +0000)]
am
b8e29d01: am
740436b6: Merge "docs: help-adt link updates" into lmp-docs
automerge:
9381301
* commit '
93813012c0be63a4cbcdf9e076323fd4afd6dfb7':
docs: help-adt link updates
Sungsoo Lim [Wed, 17 Dec 2014 17:37:53 +0000 (17:37 +0000)]
am
31d592dc: am
cd45de8b: Missing Javadoc update while API review
automerge:
d0b09b0
* commit '
d0b09b04b8c2bf666b15fcc1c496d6ab33c44a86':
Missing Javadoc update while API review
Christopher Tate [Wed, 17 Dec 2014 17:36:46 +0000 (17:36 +0000)]
am
5c3e277f: Fix bad alarm delivery
automerge:
be3206e
* commit '
be3206ecdce7aead184e8939a29ac7dd5f91931e':
Fix bad alarm delivery
John Spurlock [Thu, 11 Dec 2014 16:29:54 +0000 (11:29 -0500)]
Audio policy: Fix deprecated shouldVibrate api.
And apply zen mode immediately to avoid race conditions
in tests.
Bug:
18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
Geoff Mendal [Wed, 17 Dec 2014 15:43:53 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2
Auto-generated-cl: translation import
Geoff Mendal [Wed, 17 Dec 2014 15:22:28 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 17 Dec 2014 15:18:42 +0000 (07:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52f334af6fd23d7e74c142dafe7bb431604602e5
Auto-generated-cl: translation import
Christoph Studer [Wed, 17 Dec 2014 15:14:00 +0000 (15:14 +0000)]
Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev
Geoff Mendal [Wed, 17 Dec 2014 14:44:29 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
Paul Jensen [Wed, 17 Dec 2014 12:54:13 +0000 (12:54 +0000)]
Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
Christoph Studer [Wed, 17 Dec 2014 12:28:14 +0000 (12:28 +0000)]
am
3eff1e1f: am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '
3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
Fix MediaStyle docs mentioning 2 max actions in compact view
Christoph Studer [Wed, 17 Dec 2014 12:22:33 +0000 (12:22 +0000)]
am
92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '
92c411b24eaa787158b19b209050ea35fc5070b6':
Fix MediaStyle docs mentioning 2 max actions in compact view
Christoph Studer [Wed, 17 Dec 2014 12:16:45 +0000 (12:16 +0000)]
Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
Jinsuk Kim [Wed, 17 Dec 2014 07:15:05 +0000 (16:15 +0900)]
CEC: Pass port ID for set_audio_return_channel
This CL passes a port ID when enabling/disabling ARC in case
there are multiple HDMI ports that support the feature.
Bug:
18781204
Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2
Joe Fernandez [Wed, 17 Dec 2014 02:58:28 +0000 (02:58 +0000)]
am
6ff265cc: am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit '
6ff265cc882cd7512efcf4736b014ac27e77e5fe':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 02:58:25 +0000 (02:58 +0000)]
am
f9ea93cd: am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit '
f9ea93cdc9791c71f39caeda71d9abc9a91e89d5':
docs: studio tools help monkey update
Joe Fernandez [Wed, 17 Dec 2014 02:58:20 +0000 (02:58 +0000)]
am
b8e29d01: am
740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit '
b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194':
docs: help-adt link updates
Sungsoo Lim [Wed, 17 Dec 2014 02:40:50 +0000 (02:40 +0000)]
am
31d592dc: am
cd45de8b: Missing Javadoc update while API review
* commit '
31d592dc1cd9825c06c55562884be37f523350b3':
Missing Javadoc update while API review
Joe Fernandez [Wed, 17 Dec 2014 02:28:18 +0000 (02:28 +0000)]
am
df916a89: Merge "docs: studio revision 21 update" into lmp-docs
* commit '
df916a89feba37f8d16bd61101d43be7d1667bf8':
docs: studio revision 21 update
Joe Fernandez [Wed, 17 Dec 2014 02:28:13 +0000 (02:28 +0000)]
am
80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
* commit '
80287e768fd40b61dc4e7b8a0394e1f732805dc9':
docs: studio tools help monkey update
Joe Fernandez [Wed, 17 Dec 2014 02:21:47 +0000 (02:21 +0000)]
Merge "docs: studio revision 21 update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:20:13 +0000 (02:20 +0000)]
Merge "docs: studio tools help monkey update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 01:55:29 +0000 (01:55 +0000)]
am
740436b6: Merge "docs: help-adt link updates" into lmp-docs
* commit '
740436b6767aac4c5409b3c9f42ca2606d5ed124':
docs: help-adt link updates
Joe Fernandez [Wed, 17 Dec 2014 01:44:20 +0000 (01:44 +0000)]
Merge "docs: help-adt link updates" into lmp-docs
Sungsoo Lim [Wed, 17 Dec 2014 01:43:16 +0000 (01:43 +0000)]
am
cd45de8b: Missing Javadoc update while API review
* commit '
cd45de8ba336d689500c7a65a6a21611cc73d537':
Missing Javadoc update while API review
Yorke Lee [Wed, 17 Dec 2014 00:16:58 +0000 (00:16 +0000)]
Merge "Revert "Allow home to be pressed while in incoming call screen"" into lmp-mr1-dev
Sungsoo Lim [Fri, 28 Nov 2014 07:21:18 +0000 (16:21 +0900)]
Missing Javadoc update while API review
Bug:
18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
(cherry picked from commit
4e389e557efb7806b73d2059d46e2809c1a9f83d)
Nancy Chen [Tue, 16 Dec 2014 23:06:27 +0000 (23:06 +0000)]
Merge "Pass onPostDialChar call back from Telephony to Telecom." into lmp-mr1-dev
Cheuksan Wang [Tue, 16 Dec 2014 21:40:36 +0000 (13:40 -0800)]
remove actions and calls for the old sms/mms api
BUG:
18005911
Change-Id: Ifb900eb7f8bc03e205ac46d3dfb27e4baaaaf6b8
Tim Murray [Tue, 16 Dec 2014 21:33:01 +0000 (21:33 +0000)]
Merge "Fix typo with register native allocation." into lmp-mr1-dev
Jeff Davidson [Tue, 16 Dec 2014 19:48:54 +0000 (11:48 -0800)]
Add global setting for ephemeral network timeout.
Bug:
18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
Christopher Tate [Tue, 16 Dec 2014 21:04:56 +0000 (21:04 +0000)]
am
5c3e277f: Fix bad alarm delivery
* commit '
5c3e277fb42bd799287936c5aee0d30fbcc7e65c':
Fix bad alarm delivery
Christopher Tate [Tue, 16 Dec 2014 20:14:06 +0000 (12:14 -0800)]
Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.
They said, "You have a blue hourglass,
You do not fire alarms when they're asked."
The man replied, "Alarms as they're asked
are changed within the blue hourglass."
And they said then, "But fire, you must
Alarms beyond us, yet themselves,
Alarms within the blue hourglass
That trigger exactly when they're asked."
---
Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0. That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed. For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)
Bug
18726690
Bug
18765436
This is a 'git revert' of
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.
(Cherrypick of
5c3e277fb42bd799287936c5aee0d30fbcc7e65c from its
original branch.)
Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
Nancy Chen [Tue, 16 Dec 2014 00:12:50 +0000 (16:12 -0800)]
Pass onPostDialChar call back from Telephony to Telecom.
Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).
Bug:
18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803
Christopher Tate [Tue, 16 Dec 2014 20:14:06 +0000 (12:14 -0800)]
Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.
They said, "You have a blue hourglass,
You do not fire alarms when they're asked."
The man replied, "Alarms as they're asked
are changed within the blue hourglass."
And they said then, "But fire, you must
Alarms beyond us, yet themselves,
Alarms within the blue hourglass
That trigger exactly when they're asked."
---
Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0. That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed. For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)
Bug
18726690
Bug
18765436
This is a 'git revert' of
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.
Change-Id: I54c763775877de5b6eeb5617544aa6100bb17526
Pavel Zhamaitsiak [Tue, 16 Dec 2014 19:27:35 +0000 (19:27 +0000)]
Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev
Christoph Studer [Tue, 16 Dec 2014 18:16:40 +0000 (18:16 +0000)]
Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
Tim Murray [Tue, 16 Dec 2014 17:59:09 +0000 (09:59 -0800)]
Fix typo with register native allocation.
bug
18579193
Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
Adam Powell [Tue, 16 Dec 2014 18:01:02 +0000 (18:01 +0000)]
Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev
OSDN Git Service
