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

212023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Pedowitz
31fe464d50 Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev 2015-09-25 17:04:14 +00:00
Joe LaPenna
5d05db2877 am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev 
* commit 'ac342d3831991060c1ccac26aaa764e0a9ae7e15':
  Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
 2015-09-25 09:40:15 +00:00
Joe LaPenna
ac342d3831 Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev 2015-09-25 08:53:34 +00:00
Joe LaPenna
818c379782 Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE 
BUG: 23753686

Change-Id: Ia75046df38ebb8630e1b5ea1709bfe63eb8f177e
 2015-09-25 01:29:57 -07:00
Jorim Jaggi
1727a8e0ea am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev 
* commit '31519f637d3373ff8546360742a4b05706f0ad61':
  Do not issue config change command when not needed
 2015-09-25 07:11:24 +00:00
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
52762ce874 am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev 
* commit 'f99986eec6a263e74833d26dc8dcb107b15a9c04':
  AudioService: cleanup sco audio mode upon disconnection.
 2015-09-25 04:51:38 +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
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
8403b9b726 am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '437ee52a65e609ffce91aff8eff438ebc73d9105':
  Import translations. DO NOT MERGE
 2015-09-25 03:11:40 +00:00
Baligh Uddin
b4f7abbdae am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
  Import translations. DO NOT MERGE
 2015-09-25 03:11:34 +00:00
Baligh Uddin
c266a512cc am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '6a39ee4db5f81795cbbfce0c2a864d619e860d88':
  Import translations. DO NOT MERGE
 2015-09-25 03:11:26 +00:00
Baligh Uddin
fdfd01bef3 am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '683db0306cfd756ff96fabbd0de07fa8b0184483':
  Import translations. DO NOT MERGE
 2015-09-25 03:11:16 +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
f9f9999d32 am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev 
* commit 'b7b9b31f6969dc48174757ec236622f8d49222d0':
  Deliver camera launch source for analytics
 2015-09-25 01:38:07 +00: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
a86465d7af am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev 
* commit '8c7436558fa61b5ce9e82116b6b385f8f246d87e':
  Revert "Dismiss color fade when it is no longer used."
 2015-09-25 00:48:02 +00: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
f73aab339e am 2ce4fb0c: am a4150f49: 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 '2ce4fb0c1f4824981f6ed03135bf513d98fb3153':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-25 00:08:22 +00:00
Adrian Roos
2ce4fb0c1f am a4150f49: 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 'a4150f49d031d431a7bdcc1cdedbffc4d3e312a5':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:59:45 +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
Todd Kennedy
8f08db9def am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master 
* commit '4e321745173de1eb89343238fadfbcc7ba1a88f9':
  Frameworks/base: Propagate boot status to installd
 2015-09-24 21:48:50 +00:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master 
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
 2015-09-24 14:34:06 -07:00
Todd Kennedy
cafacef60e Merge "Frameworks/base: Propagate boot status to installd" 2015-09-24 20:35:09 +00:00