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

157924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
0e2400fb16 SysUI: QS Wifi get connected wifi rssi from NC 
Get the connected rssi for WiFi QS panel from NetworkController to
ensure it matches the status bar/QS.

Bug: 18479823
Change-Id: I82ca0cc9169a91b4e0ae6f07008d48fdb7b820f0
 2014-12-01 12:19:10 -05:00
Wally Yau
da39290460 Set stream volume to max when userMasterVolume is set to true. 
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.

Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/18460548
 2014-11-28 12:40:30 -08:00
Elliott Hughes
07b4a29131 am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '3e2848d249cafbf1cc79b600eab9bce055adcf8e':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:57:00 +00:00
Elliott Hughes
3e2848d249 am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '8fc8856268218fbd286eeb0b2f34eec23cb74f8c':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:49:58 +00:00
Elliott Hughes
8fc8856268 am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '85e21bd534d38f8de12e8229865a863f32c30e7a':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:41:15 +00:00
Elliott Hughes
85e21bd534 Mention ProGuard in the JNI documentation. 
(cherry picked from commit 8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)

Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
 2014-11-27 10:28:11 -08:00
Adrian Roos
09eeab7cbf Merge "Fix projection permission dialog layering" into lmp-mr1-dev 2014-11-27 13:01:01 +00:00
Geoff Mendal
7028dec6ca am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit '022f4277c468176d43d4ed1cc12898e33ed1a502':
  Import translations. DO NOT MERGE
 2014-11-27 10:09:40 +00:00
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
 2014-11-27 10:08:51 +00:00
smain@google.com
576e248f3c am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '277fb8fdaeb546119bc31269425edc72b75e87dd':
  define height for context images to avoid content jumps on load
 2014-11-27 10:08:45 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev 
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
 2014-11-27 09:57:35 +00:00
Amit Mahajan
4ebd1e42a7 Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 2014-11-27 03:05:48 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00
Eric Laurent
563e61f5d0 Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 2014-11-26 23:52:08 +00:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
Eino-Ville Talvala
4c9c7a5883 CameraManager: Separate service listener into a singleton 
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
 2014-11-26 13:58:15 -08:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Chris Craik
ca84c8b1b0 Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 2014-11-26 20:50:10 +00:00
Lajos Molnar
a181da10ac Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 2014-11-26 19:14:26 +00:00
vandwalle
47772ac8e9 Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 2014-11-26 19:05:02 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00
Jeff Sharkey
293f0f380b Merge "package_info GID shouldn't have write." into lmp-mr1-dev 2014-11-26 18:49:33 +00:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
 2014-11-26 18:49:01 +00:00
Geoff Mendal
022f4277c4 Import translations. DO NOT MERGE 
Change-Id: I5e59a2d77b28018d896af444cd63847d5b1e33ac
Auto-generated-cl: translation import
 2014-11-26 09:58:42 -08:00
Eric Laurent
4c3fc59b4d AudioRecord JNI: pass attributes to native AudioRecord. 
Bug: 16006090.
Change-Id: Ic6448dda0de65dada3a195cfc2ec73698b04b7b2
 2014-11-26 09:46:44 -08:00
Adrian Roos
752aee8a6f Fix projection permission dialog layering 
Bug: 18392920
Change-Id: I32c2c61339cbea9edd4a7a3f80365213fb4a69ac
 2014-11-26 18:09:35 +01:00
John Spurlock
f17f04a51e Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 2014-11-26 16:32:38 +00:00
Geoff Mendal
038c144442 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 16:30:49 +00:00
Geoff Mendal
d2160dd097 Import translations. DO NOT MERGE 
Change-Id: Ia430daa8ca9fbc8181130d7380a4ca5761d01ef1
Auto-generated-cl: translation import
 2014-11-26 08:13:55 -08:00
Jeff Davidson
8c99018a98 Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 2014-11-26 15:55:18 +00:00
Jeff Davidson
f8a3b8e008 Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev 2014-11-26 15:54:25 +00:00
John Spurlock
e506c85eaa Volume: Avoid making bad forceVolumeControlStream call. 
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.

Bug: 18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
 2014-11-26 10:11:19 -05:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE 
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
 2014-11-26 06:56:43 -08:00
Geoff Mendal
441d4f04d1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 14:32:45 +00:00
Geoff Mendal
92ed2ec015 Import translations. DO NOT MERGE 
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
 2014-11-26 06:31:37 -08:00
Jorim Jaggi
95e89caeb2 Fix jank when pin/pattern is shown 
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
  when reset gets called)
- Check for actual used security method when updating states for
  bouncer

Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
 2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Scott Main
2995bd8033 am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '5a27b4b8216cf758f302200f7a2b0a071a1be90e':
  docs:advmgr-updates
 2014-11-26 11:56:53 +00:00
smain@google.com
277fb8fdae am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'd3c172703df68c70aca6f212fda3023246869777':
  define height for context images to avoid content jumps on load
 2014-11-26 11:56:49 +00:00
Narayan Kamath
7377998dac resolved conflicts for merge of a42f7c1d to lmp-sprout-dev 
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
 2014-11-26 10:39:08 +00:00
Jinsuk Kim
57d766f533 Do not perform forceVolumeControlStream in master volume mode 
The method should be no-op when in master volume mode.

Bug: 18250921

Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
 2014-11-26 17:02:18 +09:00
Jinsuk Kim
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +00:00
Scott Main
5a27b4b821 am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'fc793074063ee40b0bc4b4cbf710802123f84251':
  docs:advmgr-updates
 2014-11-26 03:19:30 +00:00
Scott Main
fc79307406 Merge "docs:advmgr-updates" into lmp-docs 2014-11-26 03:13:27 +00:00
smain@google.com
d3c172703d am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '3a4b011c9e4260ec34b490368ccf19edb3a0b5fe':
  define height for context images to avoid content jumps on load
 2014-11-26 02:22:44 +00:00
smain@google.com
3a4b011c9e define height for context images to avoid content jumps on load 
Change-Id: I95fb6d628f8be12c31c0b7fa2978dd266f72dbf6
 2014-11-25 18:05:39 -08:00
Andy Hung
f32d06d855 Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 2014-11-26 02:04:45 +00:00