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

175607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
daa699ce1d am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 
* commit '8c99018a98a66af968bc1dc372f2f2399308bc62':
  Handle package changes in NetworkScoreService.
 2014-11-26 16:00:08 +00:00
Jeff Davidson
e5454d5733 am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'f8a3b8e008c1214afb3de99a7bccb08aa8f86796':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 16:00:03 +00: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
Geoff Mendal
9641feee02 am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '38499cf8a129b15fd526d45aad96657d96235abf':
  Import translations. DO NOT MERGE
 2014-11-26 15:13:40 +00:00
Geoff Mendal
e2d619b663 Merge "Import translations. DO NOT MERGE" 2014-11-26 15:12:02 +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
cb3a6f89f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 15:10:41 +00:00
Geoff Mendal
8d08e39018 Import translations. DO NOT MERGE 
Change-Id: I281db36394df99897f90cbf5c460cc141a4af569
Auto-generated-cl: translation import
 2014-11-26 07:09:05 -08:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
014aba26ed Import translations. DO NOT MERGE 
Change-Id: I1c487be2ef6c76224feae69f285a18ef0eda4840
Auto-generated-cl: translation import
 2014-11-26 07:03:09 -08: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
3efcd8da61 am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '441d4f04d1e7a3223449add1c70d9d2831277d0e':
  Import translations. DO NOT MERGE
 2014-11-26 14:50:06 +00:00
Jorim Jaggi
f1b05619cc am 95e89cae: Fix jank when pin/pattern is shown 
* commit '95e89caeb252a54807c76d60c7440766829e418c':
  Fix jank when pin/pattern is shown
 2014-11-26 14:49:56 +00:00
Jorim Jaggi
c5c2e53779 Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 2014-11-26 14:48:47 +00:00
Geoff Mendal
19475c24a9 Import translations. DO NOT MERGE 
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
 2014-11-26 06:39:40 -08:00
Geoff Mendal
57086523d5 Import translations. DO NOT MERGE 
Change-Id: Ic378d28436a78faca2428b60431714db6dc7a0f2
Auto-generated-cl: translation import
 2014-11-26 06:35:08 -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
d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev 
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
 2014-11-26 15:17:14 +01: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
Lajos Molnar
fdc9e9de08 am d4604b4f: am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit 'd4604b4fd370fa54d94ec94e6137b093f9f3da8c':
  media: add support for 160-byte image info in MediaCodec
 2014-11-26 12:09:56 +00:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
John Reck
e39f788950 am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:09:42 +00:00
Jorim Jaggi
2edf7d6065 am 2f47df83: am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit '2f47df83343e51214c792dc89874f0bccbeb4593':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:09:37 +00:00
Robin Lee
e07f2c01af am a7ffed86: am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'a7ffed86fce0a0cab8915bd6a727605959f08bb7':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:09:33 +00:00
Chris Craik
3c96a2b8fe am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
  Improve DisplayList state output
 2014-11-26 12:09:28 +00:00
Dianne Hackborn
6a2acff8c1 am 6df037ac: am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit '6df037ac5d2b4b6f027ca36284ee09ed10970cd8':
  Start MountService before performBootDexOpt
 2014-11-26 12:09:24 +00:00
John Spurlock
97abe5040a am a2decb0e: am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'a2decb0e4d50c68391b82e7acf6c425df2f30dd6':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:09:18 +00:00
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 12:08:47 +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
Lajos Molnar
d4604b4fd3 am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit 'c60a5d781a5e9f927d5971f2127cada9d213a128':
  media: add support for 160-byte image info in MediaCodec
 2014-11-26 12:02:50 +00:00
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:02:28 +00:00
John Reck
0d4ab958c1 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:02:19 +00:00
Jorim Jaggi
2f47df8334 am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'dccd3662da356ed7b0beedc09c8a58103723b463':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:02:13 +00:00
Robin Lee
a7ffed86fc am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'cc19e8b85b223e8a4b36ce3342c28f250fb08f91':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:02:06 +00:00
Chris Craik
1fb141f83b am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '9c5b7b094254cad0a8a90ece5ea650c49694087d':
  Improve DisplayList state output
 2014-11-26 12:01:46 +00:00
Dianne Hackborn
6df037ac5d am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit 'bafddb4aa57b79f51c0b1f5d4f4cf178069b824c':
  Start MountService before performBootDexOpt
 2014-11-26 12:01:41 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:01:35 +00:00
Narayan Kamath
0acb606df5 am c9269da2: am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'c9269da26cad88cc4d2fd84607e5245b19b29067':
  Start MountService before performBootDexOpt
 2014-11-26 11:17:25 +00:00
Narayan Kamath
c9269da26c am edda97c9: am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'edda97c9ffc4fae08744e42fdbf60040e8f97b99':
  Start MountService before performBootDexOpt
 2014-11-26 11:10:48 +00:00
Narayan Kamath
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt" 
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
 2014-11-26 11:05:46 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +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
Akira Numata
76bf60ead8 APK still has privileged flag after being moved from "/system/priv-app" 
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

Change-Id: I7713382db34697f7b68283dbbbd25a1349cbecdb
 2014-11-26 06:58:04 +00:00
Jinsuk Kim
3052fede88 am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 
* commit '1c72ba8ac3036e16a58cd1fd50c7cb01804e993e':
  CEC: Do not compare active input when updating
 2014-11-26 06:02:36 +00:00