Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,146 Commits 3 Branches 0 Tags
e69ff2a878ee7635a467259995e2924fb96a3a72
Commit Graph

200146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
e69ff2a878 Merge "Clean stale entries when deleting files." into mnc-dr-dev 2015-09-30 16:20:40 +00:00
Geoff Mendal
a6bf0ebd6e Import translations. DO NOT MERGE 
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
 2015-09-30 07:01:01 -07:00
Adam Lesinski
ffc6ce0005 Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev 2015-09-29 23:22:59 +00:00
Bill Rassieur
c25d546050 Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev 2015-09-28 23:02:46 +00:00
Jorim Jaggi
e3e6d56b94 Fix jank: Don't write lockout deadline if not needed 
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
 2015-09-28 13:57:37 -07:00
Adam Lesinski
a57a540440 Fix asymmetry in parceling/unparceling code for BatteryStats summary 
Bug:24434303
Change-Id: I638979e54076004860035396738f6a1281e26c20
 2015-09-28 10:59:45 -07:00
Billy Lau
86e153d5f0 am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 
* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
 2015-09-28 17:24:25 +00:00
Billy Lau
f360bbca96 Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 2015-09-28 17:18:30 +00:00
Adam Lesinski
d5f10154c7 Bump BatteryStats version 
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
 2015-09-27 21:28:43 +00:00
Baligh Uddin
edd35f922c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-27 04:05:09 +00:00
Baligh Uddin
0307a2a68d Import translations. DO NOT MERGE 
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
 2015-09-26 13:05:11 -07:00
Baligh Uddin
63d93ba58a Import translations. DO NOT MERGE 
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
 2015-09-26 12:34:51 -07:00
Adrian Roos
896b9c6261 Merge "Show charging speed when time to full is available" into mnc-dr-dev 2015-09-25 23:23:26 +00:00
Adrian Roos
7e39e59f37 Show charging speed when time to full is available 
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.

Bug: 24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
 2015-09-25 15:22:32 -07:00
Jeff Sharkey
307d424467 Clean stale entries when deleting files. 
When deleting files directly from external storage devices, remove
any matching entries from MediaStore so we don't end up showing
stale entries to clients, such as MTP/PTP.

Also handles the case where an entire directory is deleted.

Bug: 24045921
Change-Id: I802470fa1aa03e0bec147ea113f1a49e26a0f3f9
 2015-09-25 10:30:07 -07:00
Ian Pedowitz
31fe464d50 Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev 2015-09-25 17:04:14 +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
65bfe1cac3 Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev 2015-09-25 04:40:23 +00:00
Lorenzo Colitti
9795a1d8b9 Give the DhcpClient alarm broadcasts foreground priority. 
Bug: 24265658
Bug: 24224067
Change-Id: I375097e7957643efb4bc0bb81318b13d9b9c82c1
 2015-09-25 12:57:39 +09: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
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
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 193560002f.
 2015-09-25 00:18:19 +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
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
629909e02b Merge "Disable wifi firmware logging by default" into mnc-dr-dev 2015-09-24 03:58:38 +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
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
739bb7c694 Merge "save "retain loader" state" into mnc-dr-dev 2015-09-23 17:56:52 +00:00
Paul Jensen
4b7b811784 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 '9971167fbe7f3b356ba7fd89d91271376a56d235':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 14:50:45 +00:00
Paul Jensen
83ce299c6a 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 '62bb18976f3a79405897bf44bdec8f0abd855b9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 14:50:40 +00:00
Paul Jensen
9971167fbe 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 '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-09-23 14:42:02 +00:00