summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| | | | | | | Clear caller identity before calling TelecomManager.isInCall(). Bug: 18702149. Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
* Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-devMike Lockwood2014-12-181-0/+2
|\
| * BluetoothManagerService: Enforce DUMP permissionMike Lockwood2014-12-181-0/+2
| | | | | | | | | | Bug: 18667272 Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
* | Merge "add debug logs to confirm network flapping issue is fixed ↵vandwalle2014-12-181-3/+15
|\ \ | | | | | | | | | Bug:18706288" into lmp-mr1-dev
| * | add debug logs to confirm network flapping issue is fixedvandwalle2014-12-171-3/+15
| | | | | | | | | | | | | | | | | | Bug:18706288 Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
* | | Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-devCraig Mautner2014-12-182-8/+5
|\ \ \
| * | | Make window mgr stack movement track activity mgrCraig Mautner2014-12-172-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Bug 18784289: Fix issue with transition animation callback." into ↵Winson Chung2014-12-183-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | Bug 18784289: Fix issue with transition animation callback.Winson Chung2014-12-183-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Increase timeout when uncrypting OTA" into lmp-mr1-devMichael Runge2014-12-181-2/+2
|\ \ \ \ \
| * | | | | Increase timeout when uncrypting OTAMichael Runge2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2Rich Slogar2014-12-182-12/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 85e645a * commit '85e645ac2bf38186dce177e29f7062a3645c7917': docs: sdk revision 24.0.2
| * \ \ \ \ \ am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2Rich Slogar2014-12-182-12/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '879cffdec9c6206a3d1f3babfef2b2940a72bfa2': docs: sdk revision 24.0.2
| | * \ \ \ \ \ am 8838a9f0: docs: sdk revision 24.0.2Rich Slogar2014-12-182-12/+39
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8838a9f083ff2ecc748d70931e21cbd429ad0d45': docs: sdk revision 24.0.2
| | | * | | | | | docs: sdk revision 24.0.2Rich Slogar2014-12-172-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2427885aded49e7ceab5d66c8cb8d12cea19bc2c
* | | | | | | | | am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs.Eric Gilmore2014-12-183-16/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 8d2af0f * commit '8d2af0f9daf672183262a226e9c9410c54c133a2': Adding links for the last few files requested by PMs.
| * | | | | | | | am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs.Eric Gilmore2014-12-183-16/+44
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41ea13c8d2e350bb6167b79653f2aa65fa5d84c5': Adding links for the last few files requested by PMs.
| | * | | | | | | am fe7b93f4: Adding links for the last few files requested by PMs.Eric Gilmore2014-12-173-16/+44
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe7b93f4f7fec93650d3faec23f9cf76841d2b9e': Adding links for the last few files requested by PMs.
| | | * | | | | | Adding links for the last few files requested by PMs.Eric Gilmore2014-12-173-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If93e894a690ee5bef4b59caa234a97e3f0f7f6e4
* | | | | | | | | Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-devPavel Zhamaitsiak2014-12-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | IMS: Set phone account in IMS Conference objectAnju Mathapati2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get phone account from conference host connection and set it to ImsConference while constructing Bug: 18690773 Change-Id: I018a84512eb6ce001a8021d148895bf87dddc2ef
* | | | | | | | | | Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-devSanket Padawe2014-12-1812-114/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Removing unwanted tethering profiles from config.xmlSanket Padawe2014-12-1712-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18769044 Change-Id: I9002f6bdcd23bf02596798bcb5370ed456aaca39
* | | | | | | | | | Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-devWinson Chung2014-12-181-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removing context ref from AppWidgetHost. (Bug 18769791)Winson Chung2014-12-171-11/+11
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
* | | | | | | | | | Merge "Change to write (create) setting+subid if it does not already exist ↵Amit Mahajan2014-12-171-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it is queried for the first time." into lmp-mr1-dev
| * | | | | | | | | | Change to write (create) setting+subid if it does not already existAmit Mahajan2014-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when it is queried for the first time. Bug: 18791109 Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
* | | | | | | | | | | Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-devRaph Levien2014-12-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Change Linkify leniency to VALID"Raph Levien2014-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Preserve leading "+" in phone numbers" into lmp-mr1-devRaph Levien2014-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Preserve leading "+" in phone numbersRaph Levien2014-12-151-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The normalizeNumber method in PhoneNumberUtils preserves a leading "+" but only if it's the first character in the string. Thus it gets dropped if there is leading punctuation such as "(". This patch preserves the leading "+" as long as it would be the first character in the normalized phone number. Bug: 18418335 Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
* | | | | | | | | | | | Merge "Revert overdraw avoidance visualization change" into lmp-mr1-devChris Craik2014-12-173-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert overdraw avoidance visualization changeChris Craik2014-12-173-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18787324 Partial revert of 23d307c8d88f4a3849163b9e5b7cd11d0d4f372c. Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
* | | | | | | | | | | | | Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-devJinsuk Kim2014-12-174-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CEC: Pass port ID for set_audio_return_channelJinsuk Kim2014-12-174-12/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Add global setting for ephemeral network timeout." into lmp-mr1-devJeff Davidson2014-12-171-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add global setting for ephemeral network timeout.Jeff Davidson2014-12-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18637384 Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
* | | | | | | | | | | | | | Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into ↵Cheuksan Wang2014-12-172-12/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | | | | | | remove actions and calls for the old sms/mms apiCheuksan Wang2014-12-162-12/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18005911 Change-Id: Ifb900eb7f8bc03e205ac46d3dfb27e4baaaaf6b8
* | | | | | | | | | | | | Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-devJohn Spurlock2014-12-173-50/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-173-50/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And apply zen mode immediately to avoid race conditions in tests. Bug: 18702149 Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
* | | | | | | | | | | | | | am 48422283: Merge "make hidden text hidden with negative indent to avoid ↵smain@google.com2014-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | am 48422283: Merge "make hidden text hidden with negative indent to avoid ↵smain@google.com2014-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 * commit 'b834c72e61943fda18153bb42b3c8bd80d604b0b': make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
| | * | | | | | | | | | | am 48422283: Merge "make hidden text hidden with negative indent to avoid ↵smain@google.com2014-12-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | horizontal scroll bug: 18721145" into lmp-docs * commit '4842228377a292698b232f18706ce54cb7f7cc32': make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145
| | | * | | | | | | | | | Merge "make hidden text hidden with negative indent to avoid horizontal ↵smain@google.com2014-12-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scroll bug: 18721145" into lmp-docs
| | | | * | | | | | | | | | make hidden text hidden with negative indent to avoid horizontal scrollsmain@google.com2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18721145 Change-Id: I6efe51071d9d93697f1412243468353cd0c6d166
* | | | | | | | | | | | | | Merge "Fix colored icons in doze mode" into lmp-mr1-devJorim Jaggi2014-12-172-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix colored icons in doze modeJorim Jaggi2014-12-172-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-devNicolas Prevot2014-12-171-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix the doc of addCrossProfileIntentFilter.Nicolas Prevot2014-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that cross-profile-intent-filters only work for activity intents. BUG:18776618 Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
generated by cgit v1.1 at 2025-02-03 14:54:00 +0000