drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142,786 Commits 1 Branch 0 Tags
Commit Graph

142786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
bcc0eae1dc Merge "Hook up system audio mode" into lmp-dev 2014-07-16 23:30:53 +00:00
Jungshik Jang
377dcbd53a Hook up system audio mode 
Whenever system audio mode is changed, it should notify to AudioManager
so that AudioManager changes internal output or mute status accordingly.
To have more clear cut between last setting and current system audio mode,
renamed mSystemAudioMode into mSystemAudioActivated and added
getLastSystemAudioMode() which returns last system audio mode value stored
in global settings (NVM).

Bug: 16002150
Change-Id: I5d01d879c1c5a9a3f4b0cf2d25e9e74c26c52fa0
 2014-07-17 10:12:14 +09:00
Jungshik Jang
12307ca810 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
 2014-07-17 09:27:25 +09:00
Dianne Hackborn
8c141f7948 Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev 2014-07-16 23:42:05 +00:00
Dianne Hackborn
0d192a9e27 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
 2014-07-16 17:51:06 -07:00
Vinit Deshpande
7effa118e0 Merge "Introduce RTT Manager" into lmp-dev 2014-07-16 23:37:00 +00:00
Vinit Deshpande
7686c061b7 Introduce RTT Manager 
Change-Id: Ic9a16d587897b272f85cdb2b8c52b51bca060d18
 2014-07-17 00:45:20 +00:00
Chelsea Derrick
4ad11abac3 Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev 2014-07-16 23:42:05 +00:00
Wenchao Tong
758bdf4a91 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)
 2014-07-16 17:43:43 -07:00
Baligh Uddin
6d32e72523 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:37:00 +00:00
Baligh Uddin
02b73a5f02 Import translations. DO NOT MERGE 
Change-Id: I11c9c29232a06253d5edb83b02237ba9a9493213
Auto-generated-cl: translation import
 2014-07-16 17:36:26 -07:00
Baligh Uddin
13105e94bf Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:37:00 +00:00
Baligh Uddin
d1597c4f5f Import translations. DO NOT MERGE 
Change-Id: I3abf5d2591425f79a3b1afa86f161d4a5e197796
Auto-generated-cl: translation import
 2014-07-16 17:37:09 -07:00
Baligh Uddin
fdde4c5937 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:30:53 +00:00
Baligh Uddin
16c14533cd Import translations. DO NOT MERGE 
Change-Id: I18d8bb62a43325d925743f8ef6e5ce7562485cf2
Auto-generated-cl: translation import
 2014-07-16 17:39:00 -07:00
Jeff Davidson
58fba8b14b Merge "Expose network scoring APIs to /system apps." into lmp-dev 2014-07-16 23:37:00 +00:00
Jeff Davidson
7be8e9725f 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
 2014-07-16 17:24:46 -07:00
Baligh Uddin
12eb1ff790 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 22:04:55 +00:00
Baligh Uddin
caa601385e Import translations. DO NOT MERGE 
Change-Id: I8c040d7092dcdc68fe1e640a759123b306eff507
Auto-generated-cl: translation import
 2014-07-16 18:07:09 -07:00
Baligh Uddin
28618a384c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:42:05 +00:00
Baligh Uddin
fa8d78019c Import translations. DO NOT MERGE 
Change-Id: I499617c1385457c1f844f73b042ef5c360ad14cc
Auto-generated-cl: translation import
 2014-07-16 18:13:44 -07:00
kmccormick
1f4e56869c am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit '289d3c253eafe09a2ba3614aeeb8ba80539175b7':
  Doc Update: new Smack sample.
 2014-07-16 21:36:07 +00:00
David Friedman
8b51d07ffa am a827c738: am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit 'a827c7383273194c0dea1b5cc94e85285ee22afd':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 21:36:03 +00:00
kmccormick
289d3c253e am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs 
* commit 'fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
  Doc Update: new Smack sample.
 2014-07-16 21:17:15 +00:00
David Friedman
a827c73832 am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit '046702ba57c34893e058674dc36192796af20da7':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 21:17:12 +00:00
David Friedman
046702ba57 A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit fe545cdb4e9d49d8cf58626ef77709abecf8f26b)
 2014-07-16 19:57:44 +00:00
David Friedman
c6474d97cc am fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
* commit 'fe545cdb4e9d49d8cf58626ef77709abecf8f26b':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
 2014-07-16 19:50:24 +00:00
David Friedman
fe545cdb4e A linebreak had somehow wrongly replaced a blank space. Blank space restored. 
Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
 2014-07-16 12:33:55 -07:00
Robert Ly
f3c3edfee8 am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit 'bafdb90070bf3f5120599efd322fdd20a31e84ef':
  docs: add EU legal notice
 2014-07-16 19:28:57 +00:00
Robert Ly
bafdb90070 am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs 
* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice
 2014-07-16 19:23:46 +00:00
Quddus Chong
6743f1ea92 am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit '1a2a9730e605e5a3ea46db1049bf950a669cb0d3':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:17:18 +00:00
Quddus Chong
1a2a9730e6 am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 
* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866
 2014-07-16 18:13:19 +00:00
Chris Smith
23a0b3d9d5 am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '211c58448e21ad210a497658fdf1dd26b0c96faf':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:13:14 +00:00
Chris Smith
211c58448e am 7a047941: docs: Fix minor issues with Wear data events docs. 
* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.
 2014-07-16 18:09:17 +00:00
Deepanshu Gupta
6c57fc3019 DO NOT MERGE - Fix LayoutLib. 
This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689
 2014-07-16 10:23:28 -07:00
kmccormick
fc8a3b5f06 Merge "Doc Update: new Smack sample." into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
82088d62f8 Merge "docs: add EU legal notice" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Robert Ly
d9736032e3 docs: add EU legal notice 
bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e
 2014-07-16 12:15:11 -07:00
Quddus Chong
f0d8c6fcae Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs 2014-07-16 16:25:13 +00:00
Quddus Chong
133125446d docs: Fixed small typo. 
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9
 2014-07-16 10:28:55 -07:00
Chris Smith
7a04794186 docs: Fix minor issues with Wear data events docs. 
Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987
 2014-07-16 14:49:36 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:29:08 +00:00
Robert Ly
e104012f1b am 8231174e: am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs 
* commit '8231174ec5b4d720cde2d1d7abb40ee9bde32c7d':
  NDK filesizes and hashes updated
 2014-07-16 13:29:04 +00:00
Ricardo Cervera
9e4db5b76a am b5cd1976: am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs 
* commit 'b5cd197646a18239e976649ffa99d39c6f568d2b':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee
 2014-07-16 13:29:00 +00:00
Robert Ly
4460bff8b3 am 1374f6ea: am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs 
* commit '1374f6ea86f982e7600b9b2714747bc654243591':
  docs: add edu video highlights
 2014-07-16 13:28:56 +00:00
Andrew Solovay
52f0b5740e am 0791c612: am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs 
* commit '0791c612b9dff787fa5e081d6bb207116333b21a':
  docs: Replaced deprecated fill_parent with match_parent.
 2014-07-16 13:28:53 +00:00
Quddus Chong
13fc31df3c am b2b1c5fa: am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551 
* commit 'b2b1c5fa89a497f8e75cde7011795eae625a1722':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
 2014-07-16 13:28:49 +00:00
Ricardo Cervera
3b0909c49b am 0acf9d2f: am de138276: docs: Fix typos in the L preview docs. Bug: 16240486 
* commit '0acf9d2f9a1c74308db4632530f5b57e6cde5f9d':
  docs: Fix typos in the L preview docs. Bug: 16240486
 2014-07-16 13:28:44 +00:00
David Friedman
ede1910aa4 am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged. 
* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
 2014-07-16 13:28:37 +00:00
Andrew Solovay
5755377592 am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs 
* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
 2014-07-16 13:22:57 +00:00