Amit Mahajan
2733ea767b
Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev
2014-11-18 21:46:51 +00:00
Quddus Chong
4741fb4bb1
docs: Fixed bugs for Auto docs.
...
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
2014-11-18 13:46:44 -08:00
John Reck
51ce9cacb6
am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
Don't invalidate() on setClipBounds
2014-11-18 21:46:44 +00:00
John Reck
37cdc191e3
Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev
2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef
am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
Fix invalidateOutline
2014-11-18 21:37:40 +00:00
John Reck
3cf61d4b79
Merge "Fix invalidateOutline" into lmp-mr1-dev
2014-11-18 21:30:48 +00:00
John Reck
decc26df39
am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
...
* commit 'f0f68117c432edd5aea406e773ec5bd372976eec':
Trace some interesting events
2014-11-18 21:29:15 +00:00
John Reck
f0f68117c4
Merge "Trace some interesting events" into lmp-mr1-dev
2014-11-18 21:23:50 +00:00
Jason Monk
cd356f0dda
Automatically enable BT when entering BT QS panel
...
Bug: 18334326
Change-Id: Ifbcdee1a8260ce959eae53c0900851f8da2f97ee
2014-11-18 21:17:40 +00:00
Preeti Ahuja
d4180cc2d4
Telephony: STK CC feature implementation
...
Add strings and constants required for stk cc feature.
Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
2014-11-18 13:01:02 -08:00
Ye Wen
818b239d00
am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
...
* commit 'f984eb42724e66326549d7bf33a7ec1515a7ff3c':
Addressing API review issues for SmsManager (2/3)
2014-11-18 20:37:02 +00:00
Ye Wen
f984eb4272
Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
2014-11-18 20:30:29 +00:00
Adrian Roos
e672db2801
am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev
...
* commit 'ed0976897a8d8eb1f7bf55ae25aece84b172cbb4':
Add animations for the system bar color views
2014-11-18 20:26:14 +00:00
Adrian Roos
ed0976897a
Merge "Add animations for the system bar color views" into lmp-mr1-dev
2014-11-18 20:22:27 +00:00
Winson Chung
5c4be30ac0
am 6aa73cf2: Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev
...
* commit '6aa73cf2668e1d4b5b7534995dcc8891b4a7a279':
Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)
2014-11-18 20:15:42 +00:00
Winson Chung
6aa73cf266
Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev
2014-11-18 20:10:05 +00:00
Winson Chung
3565b6f051
am f95a9fe5: Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev
...
* commit 'f95a9fe5372c5f8f80b578ad98d66e92a7cc8608':
Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)
2014-11-18 20:03:26 +00:00
Christopher Tate
498c6cbd78
Prevent some alarm pathologies
...
* Sanity-check the recurrence interval. Some buggy apps pass seconds
where the API expects milliseconds, with the result that the device
pins the CPU at 100% trying to deliver alarm broadcasts every 60 ms
or what have you. The minimum recurrence is now 1 minute.
* Sanity-check alarms being scheduled for the immediate future. As
with the above this will catch people trying to schedule alarms
in a spammy way that keeps the device from entering low-power state.
The minimum futurity of a new alarm is now 5 seconds.
Bug 17495168
Change-Id: If8ff7d88da48960532ac21a0ba20094af9912603
2014-11-18 12:00:58 -08:00
Winson Chung
f95a9fe537
Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev
2014-11-18 19:58:56 +00:00
Winson Chung
15a2ba813a
Use SystemClock time to keep track of last event times. (Bug 17995039)
...
Change-Id: I7df1ee82568cbe3a6adbf948bd4e75dd57791032
2014-11-18 11:53:02 -08:00
Andreas Gampe
ca775941f3
Frameworks/base: Compiled-classes support
...
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.
Bug: 18410571
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
2014-11-18 11:48:22 -08:00
Sander Alewijnse
0af82f65d3
am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev
...
* commit '0925db87150300a679090a41f6eec26aad5c75e5':
Rename the dont_disable_system_apps constant.
2014-11-18 19:30:46 +00:00
Marco Nelissen
1c066306c6
Use stream type if set by user
...
Bug: 18426086
Change-Id: I0df390ddb850f8e2a02e24296f2a0d39f5718839
2014-11-18 11:28:28 -08:00
Sander Alewijnse
0925db8715
Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev
2014-11-18 19:28:17 +00:00
Bryce Lee
e19872a983
am d4e55bdf: am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
...
* commit 'd4e55bdfc50635903e04934785ed82c39257506c':
Always wake device on power key from non interactive immediately.
2014-11-18 19:16:49 +00:00
Bryce Lee
d4e55bdfc5
am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
...
* commit '8f7b84e037e35db9d3b46873bc1adf712b307cbe':
Always wake device on power key from non interactive immediately.
2014-11-18 19:12:43 +00:00
Bryce Lee
8f7b84e037
Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
2014-11-18 19:09:11 +00:00
Vinit Deshpande
c3eb155644
Fix WPS docs for LABEL method
...
Since we don't support LABEL method in startWps, document
it explicitly.
Bug: 18298388
Change-Id: I5d4c2475a68f1b41e5fc449c911b7b01b3b82fc4
2014-11-18 11:07:58 -08:00
RoboErik
519c7744b5
Handle volume events on master volume devices correctly
...
We weren't passing volume events to the master volume correctly on
devices that only use a master volume. This fix checks if the device
only has a master volume and adjusts the master volume instead of the
stream's volume if that's the case.
bug:18305790
Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
2014-11-18 11:00:34 -08:00
Dianne Hackborn
7ff92f420e
am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev
...
* commit '9522055f1d10b30158b772885bf4befe06fb2a08':
Add time estimates to batterystats dump.
2014-11-18 18:46:52 +00:00
Dianne Hackborn
9522055f1d
Merge "Add time estimates to batterystats dump." into lmp-mr1-dev
2014-11-18 18:43:29 +00:00
Selim Cinek
616cb49719
am 5e3b4f17: am b510a1cb: am 652afdf5: Increases the falsing threshold when for the keyguard affordances
...
* commit '5e3b4f1786c4108861f7a00e8bc76dd226693492':
Increases the falsing threshold when for the keyguard affordances
2014-11-18 18:42:46 +00:00
Dianne Hackborn
ad6a99b32a
Add time estimates to batterystats dump.
...
Also fix some java docs.
Change-Id: Ie705f236db6f06e34fa5581c20852e5c8f7c2c17
2014-11-18 10:41:09 -08:00
Winson Chung
66e86f9774
Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)
...
Change-Id: I78068567225f85efaa4858dc947de88d39df3f10
2014-11-18 10:38:41 -08:00
Selim Cinek
5e3b4f1786
am b510a1cb: am 652afdf5: Increases the falsing threshold when for the keyguard affordances
...
* commit 'b510a1cb7633364a0303d69f615c74acc1715ca9':
Increases the falsing threshold when for the keyguard affordances
2014-11-18 18:38:27 +00:00
Selim Cinek
b510a1cb76
am 652afdf5: Increases the falsing threshold when for the keyguard affordances
...
* commit '652afdf504cacaae8dcc334b0f1a9e282a95d768':
Increases the falsing threshold when for the keyguard affordances
2014-11-18 18:33:44 +00:00
Alan Viverette
d0c73f49b7
Don't ignore accessibility overlays during visibility computation
...
Just don't use then to compute unaccounted space. This is a partial
revert of commit 9538eea5ff6f8e2183ced81b5b8eac60b0e774ea.
Change-Id: Ie2e29c8934da8ef707d20db1333abd4e240cd213
2014-11-18 10:25:04 -08:00
Jae Seo
59f79d9b25
am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev
...
* commit '3a9a53cb75890484687c75b6fb134d21f2e7a334':
TIF: make the tune request handling more efficient
2014-11-18 18:06:24 +00:00
Jae Seo
1d96b28d1d
am f0a8c3e6: Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev
...
* commit 'f0a8c3e6743de4ec491d717961d60fcf9bc3115b':
TIF: fix NPE for TvInputHardwareManager
2014-11-18 18:06:19 +00:00
Ricardo Cervera
c3b2a00371
docs: Add link to "Voice search in your app" video.
...
Bug: 18407660
Change-Id: I9062c708b64586116e5af4df5d83b73988189e8a
2014-11-18 10:02:15 -08:00
John Spurlock
313ec49f32
am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev
...
* commit 'ce66d35fc37ce7b0630281cbc364ac8b05cf7b85':
Volume: Don't allow ringer volume of 0 exiting ringer mode.
2014-11-18 18:01:58 +00:00
Jae Seo
3a9a53cb75
Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev
2014-11-18 18:01:47 +00:00
Jae Seo
f0a8c3e674
Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev
2014-11-18 18:01:09 +00:00
John Spurlock
ce66d35fc3
Merge "Volume: Don't allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev
2014-11-18 17:57:10 +00:00
Rubin Xu
a97855b784
Remove permission check in DevicePolicyManager.isUninstallBlocked()
...
This is to allow Play to use this API to find out whether a package
is uninstallable due to profile or device owner policy's restriction.
Bug: 17914630
Change-Id: I4ce2963884ecdf3306805f36db80ed1ebf04d88f
2014-11-18 17:53:46 +00:00
Alan Viverette
8b9df16f2d
am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
...
* commit '68235e4dbca1a51fa7df7ca5d2a68c8e4b3d541c':
Prevent NPE when computing FastScroller position with no visible items
2014-11-18 17:52:42 +00:00
Jason Monk
d2263cd9db
SysUI: Refactor the NetworkControllerImpl
...
Minimal changes to interface/callbacks, all of the changes are
internal and prepare for MSIM.
Separate out AccessPoint and MobileData from the NetworkController
interface to give some space.
A SignalController class has been created as a base for both
WifiSignalController and MobileSignalController, both of which
internally handle the state of their respective connectivity and
only reach up into the NetworkControllerImpl when completely
necessary (such as for combined carrier label).
Bug: 18222975
Change-Id: I75b954bbece187371cdb8571dd8420e7d2cad978
2014-11-18 12:48:42 -05:00
Alan Viverette
68235e4dbc
Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
2014-11-18 17:46:52 +00:00
John Spurlock
2ec72ee1eb
am b30d902e: Merge "Volume: Dismiss panel on nav bar interaction." into lmp-mr1-dev
...
* commit 'b30d902ed404e5646bced27bdd2ca4006af802bf':
Volume: Dismiss panel on nav bar interaction.
2014-11-18 16:50:06 +00:00
John Spurlock
b30d902ed4
Merge "Volume: Dismiss panel on nav bar interaction." into lmp-mr1-dev
2014-11-18 16:47:11 +00:00