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

201433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
31519f637d am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev 
* commit 'ea9675e7aa11219d426a3c0ab3929ea16a34a4c7':
  Do not issue config change command when not needed
 2015-09-25 07:02:08 +00:00
Jorim Jaggi
ea9675e7aa Merge "Do not issue config change command when not needed" into mnc-dr-dev 2015-09-25 06:54:42 +00:00
Pankaj Kanwar
f99986eec6 am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev 
* commit '65bfe1cac3297d3d4463db753c0397f28c872637':
  AudioService: cleanup sco audio mode upon disconnection.
 2015-09-25 04:45:52 +00:00
Pankaj Kanwar
65bfe1cac3 Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev 2015-09-25 04:40:23 +00:00
Baligh Uddin
437ee52a65 am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '2f09d2a999edfba173771ab020b87eca7ec7ef26':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:16 +00:00
Baligh Uddin
56c2f8eefb am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '4ee34138c03dee1fd248046b135d9b4bcd84efdd':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:12 +00:00
Baligh Uddin
6a39ee4db5 am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9db221c88c678419b1c6ac7cd8223b37cd2a43a4':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:08 +00:00
Baligh Uddin
683db0306c am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9b1c6f7781fba239c1636a418a9678c8b3e53896':
  Import translations. DO NOT MERGE
 2015-09-25 03:05:04 +00:00
Baligh Uddin
2f09d2a999 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:58:40 +00:00
Baligh Uddin
4ee34138c0 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:57:21 +00:00
Baligh Uddin
9db221c88c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:56:40 +00:00
Baligh Uddin
9b1c6f7781 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-25 02:56:35 +00:00
Baligh Uddin
9a2979b27d Import translations. DO NOT MERGE 
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
 2015-09-24 19:36:51 -07:00
Eric Laurent
48221250ba AudioService: cleanup sco audio mode upon disconnection. 
Clean up SCO forced usage and A2DP suspend state upon
SCO device or profile disconnection.
This is in case the Bluetooth Headset service does not
do it.

Bug: 24316765.
Change-Id: Ifc0305607c186be49b2eb42b7868647292e56137
 2015-09-24 18:41:48 -07:00
Baligh Uddin
a37c71c2b7 Import translations. DO NOT MERGE 
Change-Id: I50eeba5466bb054212dc51f8a8d1b5b76f56a31d
Auto-generated-cl: translation import
 2015-09-24 18:40:38 -07:00
Jorim Jaggi
3b3cbb5325 Do not issue config change command when not needed 
This caused a but where WindowManager was blocked on this to perform a
layout, leading to delays in screen wake-ups.

Bug: 24383169
Change-Id: I42bc08dae9057060f09c301328bb4839a970c597
 2015-09-25 01:30:56 +00:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
 2015-09-25 01:30:43 +00:00
Jorim Jaggi
ad26dc5f15 Merge "Deliver camera launch source for analytics" into mnc-dr-dev 2015-09-25 01:27:05 +00:00
Baligh Uddin
32b843ecc0 Import translations. DO NOT MERGE 
Change-Id: I45388638f08ea212ddb1f15716a4020c3abc761c
Auto-generated-cl: translation import
 2015-09-24 18:12:20 -07:00
Baligh Uddin
566c766027 Import translations. DO NOT MERGE 
Change-Id: Iebbf559a27c2c55ec7f172ad7e6592e86452edff
Auto-generated-cl: translation import
 2015-09-24 18:10:14 -07:00
Michael Lentine
8c7436558f am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev 
* commit 'cb13da9772b41c3466c3ed514e6321c2cfb85c2a':
  Revert "Dismiss color fade when it is no longer used."
 2015-09-25 00:40:39 +00:00
Michael Lentine
cb13da9772 Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev 2015-09-25 00:31:24 +00:00
Michael Lentine
68eafe7f88 Revert "Dismiss color fade when it is no longer used." 
Bug: 24371570
This reverts commit 193560002fbc080f0006df088f8f5e9c165bfd78.
 2015-09-25 00:18:19 +00:00
Adrian Roos
a4150f49d0 am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:50:09 +00:00
Adrian Roos
f02ba4b8ff am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '09945c0bdef5acf8276d433a96de3a5589b2de86':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:40:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics 
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
 2015-09-24 16:32:09 -07:00
Adrian Roos
09945c0bde am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:32:01 +00:00
Adrian Roos
fe7ceca1ac am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:25:48 +00:00
Adrian Roos
9ceec2f0f0 am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:11:55 +00:00
Adrian Roos
f6c7515817 am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:59:37 +00:00
Adrian Roos
12c54dfa12 am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:49:19 +00:00
Adrian Roos
c9f7abe370 Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev 2015-09-24 22:39:23 +00:00
Jorim Jaggi
98a8c7c553 am e1de9f67: Fix black Keyguard 
* commit 'e1de9f674575df3b17e475c4f32dd93d33e596e3':
  Fix black Keyguard
 2015-09-24 18:08:07 +00:00
Jorim Jaggi
e1de9f6745 Fix black Keyguard 
When a window has both the flag fullscreen and the dismiss Keyguard
flag, we end up in a state where we hide the status bar window but
all other windows, because mShowingLockscreen nevers gets set
correctly. Move it up so we always set it no matter whether the
status bar window was visible.

Bug: 22875357
Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
 2015-09-24 17:47:14 +00:00
Vinit Deshpande
de02fe2afd am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev 
* commit '629909e02b97796ff0b79dbd03c2e72dd3d1e6bb':
  Disable wifi firmware logging by default
 2015-09-24 04:05:26 +00:00
Vinit Deshpande
629909e02b Merge "Disable wifi firmware logging by default" into mnc-dr-dev 2015-09-24 03:58:38 +00:00
Jorim Jaggi
27f26df629 am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 
* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
  Update message in SIM PIN view when configuration changes
 2015-09-24 02:20:37 +00:00
Jorim Jaggi
05b11bf357 Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev 2015-09-24 00:23:47 +00:00
Vinit Deshpande
4b3634513b Disable wifi firmware logging by default 
This is really needed for debugging phase, which is over
now; and disabling it will reduce surface area

Bug: 24317401

Change-Id: I0acf9efc94333cb274d4286df9c853431d86883d
 2015-09-23 16:57:18 -07:00
Jorim Jaggi
1bcb347266 am 6a15d528: Do not go over handler to dispatch keyguard visibility 
* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
  Do not go over handler to dispatch keyguard visibility
 2015-09-23 18:55:38 +00:00
Jorim Jaggi
ad371b2e22 Update message in SIM PIN view when configuration changes 
Bug: 24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
 2015-09-23 11:52:12 -07:00
Jorim Jaggi
6a15d528c0 Do not go over handler to dispatch keyguard visibility 
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.

Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
 2015-09-23 18:44:20 +00:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev 
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
 2015-09-23 18:05:58 +00:00
Todd Kennedy
739bb7c694 Merge "save "retain loader" state" into mnc-dr-dev 2015-09-23 17:56:52 +00:00
Paul Jensen
d737f715d1 am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev 
* commit '4b7b81178482029f7f58d64cea8620574294ce78':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 17:25:49 +00:00
Paul Jensen
6a728e1744 am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '83ce299c6a676819351985c379661ae1f98e806c':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 17:25:45 +00:00
Baligh Uddin
eb1e4b14c9 am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
  Import translations. DO NOT MERGE
 2015-09-23 17:25:26 +00:00
Baligh Uddin
981c592d2a am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '18daf48f1af38a75c2fb2a67204fc0852121ade2':
  Import translations. DO NOT MERGE
 2015-09-23 17:25:22 +00:00
Baligh Uddin
c31d6b705c am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'd213d28807c07e7030ae506413fbb0d2c6a9c6b9':
  Import translations. DO NOT MERGE
 2015-09-23 17:25:18 +00:00
Baligh Uddin
a58143b41c am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a6928d4d2673f38e4c4110f1d27537044540a7aa':
  Import translations. DO NOT MERGE
 2015-09-23 17:25:08 +00:00