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

120835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Mike Lockwood
a5853b177c am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:20:43 +00:00
Mike Lockwood
8611960301 am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:20:40 +00:00
Mike Lockwood
1fe28b20f1 am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '71060db65e0e1c903b429c932cd6e27beec10a3e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:14:15 +00:00
Mike Lockwood
aa7e396f44 am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit '935d417b5615a62bc521a8eb58c35de1b4fdf841':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:14:12 +00:00
Mike Lockwood
71060db65e am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit 'dffdf1079da76f532cd6e72bf537c1a69b099c7e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:09:33 +00:00
Mike Lockwood
935d417b56 am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'afc3a5d386459667f87d764038dd30e3490c64c2':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:09:31 +00:00
Mike Lockwood
dffdf1079d Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 2014-03-21 01:06:16 +00:00
Mike Lockwood
afc3a5d386 Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 2014-03-21 01:05:57 +00:00
Wei Wang
e781efd651 am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'f479d15814f58ed820829fef0bfadf73cb2b88aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:51:14 +00:00
Wei Wang
f479d15814 am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:45:42 +00:00
Wei Wang
bf0568468d am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:41:23 +00:00
Wei Wang
058061da46 Merge "Fix stopBatchedScan not working for wifi" into klp-dev 2014-03-21 00:37:34 +00:00
Adam Powell
d5f3183eed am 1c84e98f: am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit '1c84e98fc482f75a7ed4373a22096cd447bc55f9':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:33:06 +00:00
Adam Powell
1c84e98fc4 am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit 'a6454ccbfb5b1f39047f8bac74ec11093469cce2':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:26:43 +00:00
Adam Powell
a6454ccbfb am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 
* commit '49325305905198b9d077ccc784be96e5684e3623':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-21 00:22:38 +00:00
Adam Powell
4932530590 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 2014-03-21 00:19:12 +00:00
Wei Wang
d181673e28 Fix stopBatchedScan not working for wifi 
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
 2014-03-20 17:05:42 -07:00
Will Haldean Brown
06c23150bf Make windowSwipeToDismiss a public attribute. 
Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
 2014-03-20 16:31:48 -07:00
Marco Nelissen
113847c3f4 am 46b26641: am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
  Verify certificates
 2014-03-20 20:49:54 +00:00
Marco Nelissen
46b2664177 am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7d09713c5198579c0855089a0a77328d4ec1dc36':
  Verify certificates
 2014-03-20 20:45:32 +00:00
Marco Nelissen
7d09713c51 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7cd52895ec3e014c1097852725ba68646c1d6665':
  Verify certificates
 2014-03-20 20:41:54 +00:00
Marco Nelissen
7cd52895ec am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates
 2014-03-20 20:36:34 +00:00
Marco Nelissen
5035faba9a am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
  Verify certificates
 2014-03-20 13:22:34 -07:00
Marco Nelissen
cecc62086a am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates
 2014-03-20 13:16:32 -07:00
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
 2014-03-20 12:51:55 -07:00
Vinit Deshapnde
bb7fdd6e0a am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'b876cae90d8e7e57a685e31cd3b347c325728823':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:42:08 +00:00
Vinit Deshapnde
b876cae90d am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:36:59 +00:00
Mike Lockwood
d8be49089f UsbDeviceManager: A better fix for race condition when starting USB accessory mode 
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received.  However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode.  To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received.  Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.

Bug: 13393825

Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
 2014-03-20 12:36:51 -07:00
Mike Lockwood
205a3ea0e2 Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" 
This reverts commit fbd5521fb5e94fad066e21b9f91f4782afe71660.

This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start".  So we revert this change and will replace it with a better fix.

Bug: 13535051
Bug: 13393825

Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
 2014-03-20 12:36:34 -07:00
Vinit Deshapnde
f92b00722d am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:31:42 +00:00
Vinit Deshapnde
52bc363cf3 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 2014-03-20 19:26:44 +00:00
Baligh Uddin
c2221b93b9 am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ecf3c574a8cedd3b104b41623d192d61cb039710':
  Import translations. DO NOT MERGE
 2014-03-20 19:09:09 +00:00
Baligh Uddin
ecf3c574a8 am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '826f3647a4a44ffcf154c63fe204a7787b96a657':
  Import translations. DO NOT MERGE
 2014-03-20 19:02:28 +00:00
Baligh Uddin
826f3647a4 am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd16505da8676b54dd354da278b1888f28257028b':
  Import translations. DO NOT MERGE
 2014-03-20 18:37:14 +00:00
Baligh Uddin
d16505da86 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-20 18:32:35 +00:00
Marco Nelissen
c53ad4cd80 am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
  Verify certificates
 2014-03-20 11:11:16 -07:00
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
 2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
 2014-03-20 10:54:38 -07:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
 2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
 2014-03-20 10:47:34 -07:00
Colin Cross
71a3d40d20 am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 17:46:50 +00:00
Colin Cross
e4360c8e14 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit '4308a5230e2887c1ee12e7bdc60e0b93212637ab':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 10:33:20 -07:00
Colin Cross
4308a5230e Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 2014-03-20 17:28:12 +00:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev 
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
 2014-03-20 10:27:58 -07:00
Craig Mautner
97024321fc Move task to top in window manager. 
In certain situations it was possible for a task to move to the top
in activity manager but not in window manager. This resulted in
the task appearing behind the launcher icons.

Fixes bug 13410184.

Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
 2014-03-20 10:08:04 -07:00
Adam Koch
065b8fd1c3 am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '8bc12a514918deb5cee9832d9d129c8ed3f7fb4b':
  Point bitmaps training class to new samples directory.
 2014-03-20 17:05:26 +00:00
Scott Main
d4d42af5c5 am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'df00735c6791811534d3d2e2790a0dcf7daffcf1':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 17:05:23 +00:00
Wei Wang
331ef6127c am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '32779536bcd66d45019f4ab80dd0d844e618e16b':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 17:05:20 +00:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev 
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
 2014-03-20 10:04:23 -07:00