OSDN Git Service
John Spurlock [Thu, 17 Jul 2014 18:21:49 +0000 (18:21 +0000)]
am
11d850c1: am
efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '
11d850c11157aab9804d28169f9c72cca431fc1e':
Update data limit notification icon + strings.
Sandeep Siddhartha [Thu, 17 Jul 2014 18:21:44 +0000 (18:21 +0000)]
am
a2440a17: am
43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '
a2440a17e796d04ceb3470783d28f6080ee9c7dc':
Add code for isKeyphraseActive and some logging to help debug issues
John Spurlock [Thu, 17 Jul 2014 18:21:40 +0000 (18:21 +0000)]
am
7aeea625: am
45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '
7aeea625a5cd90de691c9037310553f14eb73560':
Add a zen-specific event sink, include in dumpstate.
Amith Yamasani [Thu, 17 Jul 2014 18:21:36 +0000 (18:21 +0000)]
am
d63203df: am
b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit '
d63203dfa38bf1b40ba976bfad1e9fcfeb761ddf':
Allow content provider access across users
Lorenzo Colitti [Thu, 17 Jul 2014 18:21:31 +0000 (18:21 +0000)]
am
84641420: am
1098531c: Disable logging in NetlinkTracker.
* commit '
84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 18:21:26 +0000 (18:21 +0000)]
am
3e95764e: am
b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '
3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
Santos Cordon [Thu, 17 Jul 2014 18:21:21 +0000 (18:21 +0000)]
am
f6eaf614: am
ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit '
f6eaf61480eb9f26fba8a2af9b4a409d00a53cc6':
Add toString & equals helper methods to PhoneAccount.java
Baligh Uddin [Thu, 17 Jul 2014 18:21:17 +0000 (18:21 +0000)]
am
0781731f: (-s ours) am
54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0781731fea63b9373dce076ad42c90bd95f8445f':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Jul 2014 18:21:12 +0000 (18:21 +0000)]
am
02d9aa3f: am
fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '
02d9aa3f961de03827c1e5ce8c4cc7ece402acd3':
QS: Deal with null uuids in BT controller.
Baligh Uddin [Thu, 17 Jul 2014 18:21:07 +0000 (18:21 +0000)]
am
afdeebdd: (-s ours) am
9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
afdeebdd4946c41f8cbcfd64a60592aa9286bd42':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 18:21:03 +0000 (18:21 +0000)]
am
95b45b1f: (-s ours) am
da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
95b45b1f6deccd914e774420b5571fc6f2853b1d':
Import translations. DO NOT MERGE
Jungshik Jang [Thu, 17 Jul 2014 18:20:58 +0000 (18:20 +0000)]
am
d26e2a0c: am
6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '
d26e2a0cc786608f4cb88213202f8424e29e7e9e':
Hook up system audio mode
Dianne Hackborn [Thu, 17 Jul 2014 18:20:54 +0000 (18:20 +0000)]
am
d8f0526c: am
8b353ef1: Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '
d8f0526c252b142faffddf035b3d32d35f39e7bf':
Maybe fix issue #
16167054: Wakelock is acquired and released in...
Vinit Deshpande [Thu, 17 Jul 2014 18:20:48 +0000 (18:20 +0000)]
am
ff5ceb0d: am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 18:20:43 +0000 (18:20 +0000)]
am
4e9ef0aa: (-s ours) am
52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '
4e9ef0aa90ec073f4d9066cbfecdf502c6f0a6e4':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
Baligh Uddin [Thu, 17 Jul 2014 18:20:38 +0000 (18:20 +0000)]
am
e2a2b37a: (-s ours) am
6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e2a2b37a31c202c63f2fb97e2025c1542bb76ee7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 18:20:33 +0000 (18:20 +0000)]
am
6719bbd1: (-s ours) am
ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6719bbd1188bd5be2ce5603891e3d820ceb8cb80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 18:20:28 +0000 (18:20 +0000)]
am
15ae6bc7: (-s ours) am
2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
15ae6bc7838b6575910e2cbd4f3d008e254ac873':
Import translations. DO NOT MERGE
Jeff Davidson [Thu, 17 Jul 2014 18:20:22 +0000 (18:20 +0000)]
am
62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev
* commit '
62152268d51b8b7726a806e48750a810e23eab40':
Expose network scoring APIs to /system apps.
Jungshik Jang [Thu, 17 Jul 2014 18:20:18 +0000 (18:20 +0000)]
am
3ac63bd8: Revisit HDMI-CEC system audio mode in AudioService.
* commit '
3ac63bd86b5887c69053eb79319cbc5df7ed5de9':
Revisit HDMI-CEC system audio mode in AudioService.
Robert Greenwalt [Thu, 17 Jul 2014 18:18:00 +0000 (18:18 +0000)]
am
004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev
* commit '
004a427e630e1db09df00e8f826627f919183c89':
Make a network the default when it connects if we have no default.
Brian Colonna [Thu, 17 Jul 2014 18:17:55 +0000 (18:17 +0000)]
am
6f6fcecb: Bug
16152902: Disabling FUL in keyguard and screen lock settings
* commit '
6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
Bug
16152902: Disabling FUL in keyguard and screen lock settings
Fabrice Di Meglio [Thu, 17 Jul 2014 18:15:08 +0000 (18:15 +0000)]
am
6bbea8cf: Fix LocalePicker background
* commit '
6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
Ye Wen [Thu, 17 Jul 2014 18:15:02 +0000 (18:15 +0000)]
am
0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev
* commit '
0353e451c6ccbbce461e911162543a7c96fc5523':
Unhide new MMS API and SMS storage API (1/2)
Robert Shih [Thu, 17 Jul 2014 18:14:57 +0000 (18:14 +0000)]
am
5f48c625: MediaRecorder: added constants for WEBM output
* commit '
5f48c6258ffc537454e4df9b49a3ebee652cfaee':
MediaRecorder: added constants for WEBM output
Eric Laurent [Thu, 17 Jul 2014 18:14:50 +0000 (18:14 +0000)]
am
aaaa07c2: Merge "AudioService: Use device specific mode to open SCO audio" into lmp-dev
* commit '
aaaa07c28bf9ad4083ab9e64953e1970d66c217b':
AudioService: Use device specific mode to open SCO audio
Fabrice Di Meglio [Thu, 17 Jul 2014 18:14:45 +0000 (18:14 +0000)]
am
bfe21a64: Fix bug #
16353909 Preferences RTL support is sometimes broken
* commit '
bfe21a6401656f056a0ee74b97981591fb8e266e':
Fix bug #
16353909 Preferences RTL support is sometimes broken
Chelsea Derrick [Thu, 17 Jul 2014 18:14:40 +0000 (18:14 +0000)]
am
42a0114c: (-s ours) Merge "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" into lmp-dev
* commit '
42a0114c36ee9c0b1d6285c7704da38aa69e817e':
Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]
Fabrice Di Meglio [Thu, 17 Jul 2014 18:14:33 +0000 (18:14 +0000)]
am
b56e3cad: Fix #
16348486 [RTL] Checkboxes are improperly aligned
* commit '
b56e3caddf6f9b6ca59975981caa25bf3d56b9e7':
Fix #
16348486 [RTL] Checkboxes are improperly aligned
Alan Viverette [Thu, 17 Jul 2014 18:14:28 +0000 (18:14 +0000)]
am
8e97a200: Fix software dirty region, don\'t add insets to software windows
* commit '
8e97a200ecf1985dcf2fd3a004b53e59640b3374':
Fix software dirty region, don't add insets to software windows
Yigit Boyar [Thu, 17 Jul 2014 18:14:23 +0000 (18:14 +0000)]
am
d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
* commit '
d8607b40b57332619f3be66ffa5250394acbc5f7':
Change Animators to reset values when restarted if their target changes
John Reck [Thu, 17 Jul 2014 18:14:18 +0000 (18:14 +0000)]
am
c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
* commit '
c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
Stuart Scott [Thu, 17 Jul 2014 18:14:13 +0000 (18:14 +0000)]
am
b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit '
b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
MSIM: dump sub specific info
kmccormick [Thu, 17 Jul 2014 18:14:09 +0000 (18:14 +0000)]
am
7a0ace2d: am
1f4e5686: am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
7a0ace2dd99b43f1a9f22d184893216e28dc0494':
Doc Update: new Smack sample.
David Friedman [Thu, 17 Jul 2014 18:14:05 +0000 (18:14 +0000)]
am
a4690c90: am
8b51d07f: am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
a4690c90675ad821e0aafdd44e697552cd8fccea':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Sailesh Nepal [Thu, 17 Jul 2014 18:05:42 +0000 (11:05 -0700)]
resolved conflicts for merge of
03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
Christopher Tate [Thu, 17 Jul 2014 16:45:23 +0000 (16:45 +0000)]
am
c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit '
c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
Jeff Sharkey [Thu, 17 Jul 2014 16:45:19 +0000 (16:45 +0000)]
am
2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '
2158503ff835f60d1a39f5bac724dd90e0900403':
Install sessions only inherit APK files.
Shishir Agrawal [Thu, 17 Jul 2014 16:45:14 +0000 (16:45 +0000)]
am
38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '
38c365d037e40385f2b25cd0fe0214c24f2f08ed':
Unhiding the SMS/MMS APIs for injection/transport.
Sharvil Nanavati [Thu, 17 Jul 2014 16:45:10 +0000 (16:45 +0000)]
am
3afc825a: Launch processes running under the \'bluetooth\' uid with CAP_WAKE_ALARM.
* commit '
3afc825ae1dcbff19fa1eec345c3a0a685216fa0':
Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.
Alan Viverette [Thu, 17 Jul 2014 16:45:05 +0000 (16:45 +0000)]
am
ca27046e: Merge "Fix state list drawable transitions" into lmp-dev
* commit '
ca27046ee1fd2e23512af943177d4eb35757865b':
Fix state list drawable transitions
Fabrice Di Meglio [Thu, 17 Jul 2014 16:45:01 +0000 (16:45 +0000)]
am
fd6eeda0: Fix bug #
16309454 Broken recent button after dismissing set time dialog
* commit '
fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #
16309454 Broken recent button after dismissing set time dialog
Jeff Davidson [Thu, 17 Jul 2014 16:44:56 +0000 (16:44 +0000)]
am
8f406122: Remove obsolete remark from XXHDPI comment.
* commit '
8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
David Friedman [Thu, 17 Jul 2014 16:44:47 +0000 (16:44 +0000)]
am
6ec875ea: am
c6474d97: am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
6ec875ea49e4f3e3621a1844df3968881d5cac40':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:42 +0000 (16:44 +0000)]
am
f9c7a0ab: (-s ours) Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
* commit '
f9c7a0ab4ea11932b0710df5933b1db63f36ba81':
Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:38 +0000 (16:44 +0000)]
am
08f4aef0: (-s ours) Optimize Blend composites. [DO NOT MERGE]
* commit '
08f4aef0f198d52b9c67def64626ff42593ad278':
Optimize Blend composites. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Jul 2014 16:44:34 +0000 (16:44 +0000)]
am
21b0919f: (-s ours) Add BlendComposite.java [DO NOT MERGE]
* commit '
21b0919fef8d160debe4651e414248b74cff6f29':
Add BlendComposite.java [DO NOT MERGE]
Barnaby James [Wed, 16 Jul 2014 21:27:39 +0000 (14:27 -0700)]
Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
John Spurlock [Thu, 17 Jul 2014 14:17:12 +0000 (14:17 +0000)]
am
efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '
efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
Update data limit notification icon + strings.
Sandeep Siddhartha [Thu, 17 Jul 2014 14:17:08 +0000 (14:17 +0000)]
am
43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '
43bc655b3c5ddd70af813280d9125797d076d00e':
Add code for isKeyphraseActive and some logging to help debug issues
John Spurlock [Thu, 17 Jul 2014 14:17:05 +0000 (14:17 +0000)]
am
45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '
45aebdf2d2b552914abf9656a69bc92bd6540b54':
Add a zen-specific event sink, include in dumpstate.
Amith Yamasani [Thu, 17 Jul 2014 14:17:01 +0000 (14:17 +0000)]
am
b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit '
b31b07c8b10937f3071300068da64158d3686513':
Allow content provider access across users
Lorenzo Colitti [Thu, 17 Jul 2014 14:16:57 +0000 (14:16 +0000)]
am
1098531c: Disable logging in NetlinkTracker.
* commit '
1098531c19d337b4544c51e446e859d86e7fdab9':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 14:16:53 +0000 (14:16 +0000)]
am
b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '
b63869a6fb76ede4492f2184ae005687ac70c916':
Add accessibility text contrast setting
Santos Cordon [Thu, 17 Jul 2014 14:16:50 +0000 (14:16 +0000)]
am
ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit '
ec82a805b55ce61e2049d66d74fbab5610577013':
Add toString & equals helper methods to PhoneAccount.java
Baligh Uddin [Thu, 17 Jul 2014 14:16:47 +0000 (14:16 +0000)]
am
54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
54639300d0ec7424fe6b18ba82f0293c2543c62f':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Jul 2014 14:16:43 +0000 (14:16 +0000)]
am
fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '
fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
QS: Deal with null uuids in BT controller.
Baligh Uddin [Thu, 17 Jul 2014 14:16:40 +0000 (14:16 +0000)]
am
9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9988df2980dbe0529eca8ba4379b061197166a55':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:36 +0000 (14:16 +0000)]
am
da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
da616efd015e372c3e02c1b9368fe66badb0341d':
Import translations. DO NOT MERGE
Jungshik Jang [Thu, 17 Jul 2014 14:16:33 +0000 (14:16 +0000)]
am
6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '
6d98d91f01dc77af031bf9d8537d101110ba43e5':
Hook up system audio mode
Dianne Hackborn [Thu, 17 Jul 2014 14:16:30 +0000 (14:16 +0000)]
am
8b353ef1: Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '
8b353ef1ac284d2ad306de7d6609ebc1b1053ede':
Maybe fix issue #
16167054: Wakelock is acquired and released in...
Vinit Deshpande [Thu, 17 Jul 2014 14:16:26 +0000 (14:16 +0000)]
am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
0b4d73dd5885a2ef86e14f77ff1963c42d6c59b9':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 14:16:23 +0000 (14:16 +0000)]
am
52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '
52c8bd50f87388f6c32b3664d46723490e7e3502':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
Baligh Uddin [Thu, 17 Jul 2014 14:16:19 +0000 (14:16 +0000)]
am
6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6b7e527ae3433a7be5234578d923a6ed149e3e48':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:16 +0000 (14:16 +0000)]
am
ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ca0db50aaa768353686fdcf76de6dfb701bf67e0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:13 +0000 (14:16 +0000)]
am
2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2b8858a901e45119c78e239c2c34b3e2486ee692':
Import translations. DO NOT MERGE
Robert Ly [Thu, 17 Jul 2014 14:13:16 +0000 (14:13 +0000)]
am
b9a7c675: am
d2d27a5f: am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
b9a7c67599d2f424f2b6bc445099a893aa8433bc':
docs: add EU legal notice
Winson Chung [Thu, 17 Jul 2014 14:13:12 +0000 (14:13 +0000)]
am
a0eeb67a: am
24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug
16327074)" into lmp-dev
* commit '
a0eeb67ad97ce1d7633e0ee3153a994ae78e1861':
Don't clobber intent flags when starting recent activities anew. (Bug
16327074)
RoboErik [Thu, 17 Jul 2014 14:13:02 +0000 (14:13 +0000)]
am
22ea3c3d: am
b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '
22ea3c3ddaad1b25c05c3e6e6027747076d44750':
Change adjustVolumeBy to adjustVolume
ztenghui [Thu, 17 Jul 2014 14:12:58 +0000 (14:12 +0000)]
am
7fdb6e06: am
6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '
7fdb6e0658855bb0a3ffe78c05bf509aa73aa1d7':
Add more reverse support to AnimatedVD
RoboErik [Thu, 17 Jul 2014 14:12:53 +0000 (14:12 +0000)]
am
1cd008e1: am
9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '
1cd008e1fe13b97068c3eac86b1b78ab20dca1fb':
Make MediaSession and MediaController constructors public
Robert Ly [Thu, 17 Jul 2014 14:02:58 +0000 (14:02 +0000)]
am
d2d27a5f: am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
d2d27a5f8d7f641cda4a04c2fe285d17ca924226':
docs: add EU legal notice
Winson Chung [Thu, 17 Jul 2014 14:02:55 +0000 (14:02 +0000)]
am
24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug
16327074)" into lmp-dev
* commit '
24d04eebfe00e0d8346c2864d84f04b4d046b9e1':
Don't clobber intent flags when starting recent activities anew. (Bug
16327074)
RoboErik [Thu, 17 Jul 2014 14:02:50 +0000 (14:02 +0000)]
am
b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '
b21fab77c0758da3dcb2fa0029fef92df4d5902a':
Change adjustVolumeBy to adjustVolume
ztenghui [Thu, 17 Jul 2014 14:02:46 +0000 (14:02 +0000)]
am
6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '
6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
Add more reverse support to AnimatedVD
RoboErik [Thu, 17 Jul 2014 14:02:42 +0000 (14:02 +0000)]
am
9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '
9b039cf80a0c0c388ccbd8b6ece9aa5c7b970f26':
Make MediaSession and MediaController constructors public
Sandeep Siddhartha [Wed, 16 Jul 2014 22:36:44 +0000 (15:36 -0700)]
Add code for isKeyphraseActive and some logging to help debug issues
Change-Id: I89f2090be5a5fe5f7c0da1648a0d46a093893fe2
Lorenzo Colitti [Thu, 17 Jul 2014 01:13:27 +0000 (10:13 +0900)]
Disable logging in NetlinkTracker.
This logging can get quite spammy in GoogleGuest, and there's
currently no reason to think it's necessary. Much of the same
information is available via "adb shell ndc monitor".
Bug:
16328180
Change-Id: I15a8348e261d6b69a4ef8bdaf8a2a431b1c2bc0d
Santos Cordon [Mon, 14 Jul 2014 10:32:56 +0000 (03:32 -0700)]
Add toString & equals helper methods to PhoneAccount.java
Bug:
16292368
Change-Id: I5dd2bcd2d65e856107ac2f80958e8b408abcec0b
Jungshik Jang [Tue, 15 Jul 2014 10:27:56 +0000 (19:27 +0900)]
Revisit HDMI-CEC system audio mode in AudioService.
From recent feedback on HDMI-CEC system audio mode,
it would be unnecessary to enforce output from AudioService.
Instead, it would follow audio policy according to status
of HDMI-CEC system audio mode.
For that removed two params of setHdmiSystemAudioModeSupported
api of AudioManager.
In terms of speaker mute, it will be handled by removing speaker
from audio ouput instead of changing gain control. For that
added new force usage type, FOR_HDMI_SYSTEM_AUDIO_MODE and
new force config type, FORCE_HDMI_SYSTEM_AUDIO_ENFORCED.
This is used to notify change of system audio mode to
audio policy manager.
Bug:
16305986
Bug:
16002150
Change-Id: I5643ad093a651c951e12b567c6e11b88aa87cea2
Nicolas Prevot [Thu, 17 Jul 2014 13:17:11 +0000 (13:17 +0000)]
Merge "Remove cross-profile intent filters when removing a user."
Niels Egberts [Wed, 25 Jun 2014 12:48:32 +0000 (13:48 +0100)]
TtsSpan builders for each TtsSpan type.
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.
For now it only contains Text and Cardinal types.
Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
Nicolas Prevot [Tue, 8 Jul 2014 14:47:17 +0000 (15:47 +0100)]
Remove cross-profile intent filters when removing a user.
When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.
Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
Brian Colonna [Wed, 16 Jul 2014 17:50:47 +0000 (13:50 -0400)]
Bug
16152902: Disabling FUL in keyguard and screen lock settings
This is the framework change needed to switch from Face Unlock as
a standard unlock mechanism to Face Unlock as a trustlet. This
forces isBiometricWeakInstalled() to return false such that neither
keyguard nor Screen Lock Settings thinks it exists. This means FUL
is no longer a screen lock option.
If Face Unlock was already enabled and someone updates to this build,
the screen lock automatically switches to the backup lock. That
functionality was already built-in so everything would continue to
work if Face Unlock decided to disappear from someone's device.
Change-Id: I407f6e1d75bfe40c7142c2508c2d68867e02d858
Fabrice Di Meglio [Wed, 16 Jul 2014 23:37:51 +0000 (16:37 -0700)]
Fix LocalePicker background
- use the background defined by the Theme
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I30f1146fbcb57088a62c999dce349d1f85510427
Amith Yamasani [Thu, 17 Jul 2014 01:44:08 +0000 (01:44 +0000)]
Merge "Allow content provider access across users" into lmp-dev
Amith Yamasani [Thu, 17 Jul 2014 00:47:40 +0000 (17:47 -0700)]
Allow content provider access across users
If the package has INTERACT_ACROSS_USERS. This had recently
regressed. Bringing back the functionality needed for multiuser
call log syncing.
Bug:
16298776
Change-Id: I4fdc3d676bb8a2bf78f5c27c41a74c0491e343cd
Baligh Uddin [Thu, 17 Jul 2014 01:20:46 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 17 Jul 2014 01:13:44 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I499617c1385457c1f844f73b042ef5c360ad14cc
Auto-generated-cl: translation import
Dianne Hackborn [Thu, 17 Jul 2014 00:51:53 +0000 (00:51 +0000)]
Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
Dianne Hackborn [Tue, 15 Jul 2014 23:39:47 +0000 (16:39 -0700)]
Maybe fix issue #
16167054: Wakelock is acquired and released in...
...battery history even though CPU is in suspend
There is a race in the power manager between noting a wake lock
acquire and ensuring the device is staying awake.
Change-Id: I3d76f99d73dca119b09f253f0e31448408c88a3c
Chelsea Derrick [Thu, 17 Jul 2014 00:45:28 +0000 (00:45 +0000)]
Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
Wenchao Tong [Mon, 16 Jun 2014 22:12:27 +0000 (15:12 -0700)]
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
This is very similar to the existing
WifiManger.getConfiguredNetworks(), but it returns real preSharedKey.
This API is only used by system application.
Bug:
15703353
Change-Id: If3eaca3286e77b780272f42a28772d1d8d39db65
(cherry picked from commit
775bf6ae5d052948bcb60eaf89defa9105d7077c)
Jeff Davidson [Thu, 17 Jul 2014 00:41:20 +0000 (00:41 +0000)]
Merge "Expose network scoring APIs to /system apps." into lmp-dev
Jeff Davidson [Thu, 17 Jul 2014 00:24:46 +0000 (17:24 -0700)]
Expose network scoring APIs to /system apps.
Ideally, we'd only expose the methods that we intend unbundled apps to
call (e.g. not NetworkScoreManager#setActiveScorer, which should only
be called by Settings), but this isn't harmful in terms of permissions
as the APIs still check security appropriately.
Bug:
15833200
Change-Id: I2047515b41c8be0cf7cb51dd495fe72309c05f68
Vinit Deshpande [Thu, 17 Jul 2014 00:46:28 +0000 (00:46 +0000)]
Merge "Introduce RTT Manager" into lmp-dev
Vinit Deshpande [Mon, 30 Jun 2014 22:25:01 +0000 (15:25 -0700)]
Introduce RTT Manager
Change-Id: Ic9a16d587897b272f85cdb2b8c52b51bca060d18
Baligh Uddin [Thu, 17 Jul 2014 00:44:34 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 17 Jul 2014 00:36:26 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I11c9c29232a06253d5edb83b02237ba9a9493213
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Jul 2014 00:44:32 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev