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

111698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
2663ec405d am 185601d4: am 3a9a4c2a: am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit '185601d43146765852de71ce9310b00ce88025bf':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 15:11:32 -07:00
Jeff Tinker
d1c0eff569 am ded3c260: am 91b87de7: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev 
* commit 'ded3c260a4fef10cb85b27c9c172717dd770d6e0':
  Enhancement for OnInfo callback on DRM Framework
 2013-08-26 15:11:30 -07:00
Daniel Sandler
6561841e7d am e820825c: am fead1290: Make xxhdpi adb icon consistent with other densities. 
* commit 'e820825c8129344b14d3db04f7bed5274028ca1a':
  Make xxhdpi adb icon consistent with other densities.
 2013-08-26 15:11:27 -07:00
Ying Wang
f3f80e34cb am b44e5561: am 94366313: Fix docs build. 
* commit 'b44e5561def5845e0b18e7b2e178dc12a415b9af':
  Fix docs build.
 2013-08-26 15:11:24 -07:00
Jim Miller
b155194775 am 517c8cf3: am 14cabdab: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit '517c8cf31833cc8fde0e6546c41af7d39e5e5429':
  Add setting to disable keyguard widgets
 2013-08-26 15:11:20 -07:00
Jeff Brown
18643b58ee am 2517d08b: am 61d806c7: Merge "Docs changes pursuant to API review feedback." into klp-dev 
* commit '2517d08b9a09d123729b01d34840e96f099ea704':
  Docs changes pursuant to API review feedback.
 2013-08-26 15:11:17 -07:00
destradaa
4548c19704 am 8ea7b216: am 9e73cce6: Merge "Fix leaks of JNI objects in the local reference table" into klp-dev 
* commit '8ea7b216703aa902012f8f1143ba38dc67f7e4f3':
  Fix leaks of JNI objects in the local reference table
 2013-08-26 15:11:14 -07:00
Tim Murray
61cc40bedc am 493a4c85: am c264e044: Merge "Add garbage collection hooks" into klp-dev 
* commit '493a4c85cd6476a9b932a3146421eab0f662113a':
  Add garbage collection hooks
 2013-08-26 15:11:11 -07:00
Chong Zhang
2e0ee66389 am 9c70038c: am 5de1faca: Merge "wifi-display: add certification options" into klp-dev 
* commit '9c70038cba0e265b553aa8cda9b133fd8866b692':
  wifi-display: add certification options
 2013-08-26 15:11:07 -07:00
Jeff Sharkey
943bc8b389 am 308aacb9: am 365768fd: Merge "Return EXIF thumbnails when available." into klp-dev 
* commit '308aacb924898b95d6114edfff3a985c897f2c6f':
  Return EXIF thumbnails when available.
 2013-08-26 15:11:04 -07:00
Jeff Sharkey
98e154c039 am d0fcacd9: am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev 
* commit 'd0fcacd949cd8b42b37d238a4ba74e3c29325277':
  Add CancellationSignal support to file operations.
 2013-08-26 15:11:01 -07:00
Dirk Dougherty
ec71e32a80 am 43bc44f5: am 570cd0f4: am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs. 
* commit '43bc44f51250bf2568c2f64c106eb4a59b703bb2':
  Doc change: fix typo in policy docs.
 2013-08-26 15:10:59 -07:00
Baligh Uddin
dd896009ab am 056c7d48: (-s ours) am 4f5e0804: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '056c7d48765f10ffac4117145757e804f5e709be':
  Import translations. DO NOT MERGE
 2013-08-26 15:10:56 -07:00
Baligh Uddin
7f39cac6b2 am dc010ce5: (-s ours) am 881de10c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'dc010ce544662cc82a0ccd28a6619ec0485f3b76':
  Import translations. DO NOT MERGE
 2013-08-26 15:10:52 -07:00
Svetoslav Ganov
f026518672 am e0612ffe: am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev 
* commit 'e0612ffe5495602134d60422f63bfc05387512e1':
  Print UI bug fixing and printer discovery refactoring.
 2013-08-26 15:10:49 -07:00
John Huang
8317c1d6a8 am 0d3313ec: am 83bc5a8a: Merge "Additional logging to debug lost Wifi APs" into klp-dev 
* commit '0d3313ecb6ec5aefb79d545a0853ddd1ec6b87ee':
  Additional logging to debug lost Wifi APs
 2013-08-26 15:10:46 -07:00
Baligh Uddin
82d02fc4bc am 33c9f69b: (-s ours) am 8a2df167: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '33c9f69bb12908a9bb48594624529e97f5ee4828':
  Import translations. DO NOT MERGE
 2013-08-26 15:10:43 -07:00
Baligh Uddin
4934753d5c am 54239215: (-s ours) am e1f9e2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '54239215ae7bb68b310d0ab0b50c139927666f00':
  Import translations. DO NOT MERGE
 2013-08-26 15:10:41 -07:00
Zhijun He
17e5e089a2 am 1278507a: am 4cabe3ea: Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev 
* commit '1278507a83c47c1510e7f8d6a8898ea2ae9e727e':
  ImageReader: Fix API doc table misalignment issue
 2013-08-26 15:10:38 -07:00
Jason Monk
96eee102b0 am 4163241f: am 4359d564: Merge "System binds PAC Local Proxy instead of self start" into klp-dev 
* commit '4163241f146bffeda889bd8a04455945fc9f4922':
  System binds PAC Local Proxy instead of self start
 2013-08-26 15:10:35 -07:00
Wink Saville
185601d431 am 3a9a4c2a: am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit '3a9a4c2a1005cabffec74369f39201c827a87936':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 15:04:25 -07:00
Jeff Tinker
ded3c260a4 am 91b87de7: Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev 
* commit '91b87de7e1d9ddcef2dd1da0c7ad85a04ab2fe6f':
  Enhancement for OnInfo callback on DRM Framework
 2013-08-26 15:04:03 -07:00
Daniel Sandler
e820825c81 am fead1290: Make xxhdpi adb icon consistent with other densities. 
* commit 'fead1290d74492af5fdf3dcb6739fbd1898dc239':
  Make xxhdpi adb icon consistent with other densities.
 2013-08-26 15:04:00 -07:00
Ying Wang
b44e5561de am 94366313: Fix docs build. 
* commit '94366313331a789440a3c077173aafcb85cabe78':
  Fix docs build.
 2013-08-26 15:03:43 -07:00
Jim Miller
517c8cf318 am 14cabdab: Merge "Add setting to disable keyguard widgets" into klp-dev 
* commit '14cabdabac1eb87026e4bbd71a18530031b1dd34':
  Add setting to disable keyguard widgets
 2013-08-26 15:03:33 -07:00
Jeff Brown
2517d08b9a am 61d806c7: Merge "Docs changes pursuant to API review feedback." into klp-dev 
* commit '61d806c76ad1158f5cfbf3daef87dac81e51fc94':
  Docs changes pursuant to API review feedback.
 2013-08-26 15:03:30 -07:00
destradaa
8ea7b21670 am 9e73cce6: Merge "Fix leaks of JNI objects in the local reference table" into klp-dev 
* commit '9e73cce6acef3b5116a49e724f1b90b560a771e5':
  Fix leaks of JNI objects in the local reference table
 2013-08-26 15:03:27 -07:00
Tim Murray
493a4c85cd am c264e044: Merge "Add garbage collection hooks" into klp-dev 
* commit 'c264e0440076ccca4be6ec66e33bcd7f8a1ae5b3':
  Add garbage collection hooks
 2013-08-26 15:03:14 -07:00
Chong Zhang
9c70038cba am 5de1faca: Merge "wifi-display: add certification options" into klp-dev 
* commit '5de1faca166e2241cf9ad1981007caa947a1fc1b':
  wifi-display: add certification options
 2013-08-26 15:03:00 -07:00
Jeff Sharkey
308aacb924 am 365768fd: Merge "Return EXIF thumbnails when available." into klp-dev 
* commit '365768fd3533343d6631875d7d46882907f7ab09':
  Return EXIF thumbnails when available.
 2013-08-26 15:02:57 -07:00
Jeff Sharkey
d0fcacd949 am 98d62123: Merge "Add CancellationSignal support to file operations." into klp-dev 
* commit '98d6212327d1c483894b642d5e24c3aac9fca9cf':
  Add CancellationSignal support to file operations.
 2013-08-26 15:02:53 -07:00
Dirk Dougherty
43bc44f512 am 570cd0f4: am f1fea527: am be2f72a1: am 2c30fe8a: Doc change: fix typo in policy docs. 
* commit '570cd0f4c06a6e3de2af348040415ff2fcff57a1':
  Doc change: fix typo in policy docs.
 2013-08-26 15:02:39 -07:00
Baligh Uddin
056c7d4876 am 4f5e0804: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4f5e080486f076517ef4ecc02437dfaf6df46d6b':
  Import translations. DO NOT MERGE
 2013-08-26 15:02:23 -07:00
Baligh Uddin
dc010ce544 am 881de10c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '881de10cfccabd51aa3c9d22702214110fb97b55':
  Import translations. DO NOT MERGE
 2013-08-26 15:02:20 -07:00
Svetoslav Ganov
e0612ffe54 am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev 
* commit '826debf5f806fdab77f9e3aa17d4e32abc87ec77':
  Print UI bug fixing and printer discovery refactoring.
 2013-08-26 15:01:57 -07:00
John Huang
0d3313ecb6 am 83bc5a8a: Merge "Additional logging to debug lost Wifi APs" into klp-dev 
* commit '83bc5a8a8674ae02592c73993795d83eaae8fe47':
  Additional logging to debug lost Wifi APs
 2013-08-26 15:01:12 -07:00
Baligh Uddin
33c9f69bb1 am 8a2df167: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8a2df167456e3a5ffce407e8ce694994dd4e24ae':
  Import translations. DO NOT MERGE
 2013-08-26 15:00:49 -07:00
Baligh Uddin
54239215ae am e1f9e2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e1f9e2f60d25b661837d2860e9fdb6ac76d1768e':
  Import translations. DO NOT MERGE
 2013-08-26 15:00:46 -07:00
Zhijun He
1278507a83 am 4cabe3ea: Merge "ImageReader: Fix API doc table misalignment issue" into klp-dev 
* commit '4cabe3eae8068695933dd3fb10a6ee9071bc658f':
  ImageReader: Fix API doc table misalignment issue
 2013-08-26 15:00:41 -07:00
Jason Monk
4163241f14 am 4359d564: Merge "System binds PAC Local Proxy instead of self start" into klp-dev 
* commit '4359d56420b114f433ba4187c2d1f341bb35c938':
  System binds PAC Local Proxy instead of self start
 2013-08-26 15:00:22 -07:00
Wink Saville
3a9a4c2a10 am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit '4e6e1749eda5a2c84538b0064fdc219aab3605e1':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 11:46:29 -07:00
Wink Saville
4e6e1749ed am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit 'b42beeafcf8117fb4ac41dd91fc9e6113c0d6aae':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 11:43:25 -07:00
Wink Saville
b42beeafcf am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported. 
* commit 'e63411f28b81a0c9f7fee1d0b3a0765606c9a6f2':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-26 11:40:36 -07:00
Jeff Tinker
91b87de7e1 Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev 2013-08-26 16:09:08 +00:00
Daniel Sandler
fead1290d7 Make xxhdpi adb icon consistent with other densities. 
Bug: 10487353
Change-Id: I50441587988d36e94cfb453ab9706b0ae46b066b
 2013-08-26 11:04:02 -04:00
Ying Wang
9436631333 Fix docs build. 
Change-Id: I3299e59fd90141fee324129ff3b251bdf8f60f10
 2013-08-23 22:20:03 -07:00
Jim Miller
14cabdabac Merge "Add setting to disable keyguard widgets" into klp-dev 2013-08-24 01:28:28 +00:00
Takeshi Aimi
6fd97b7d93 Enhancement for OnInfo callback on DRM Framework 
In DRM framework, plugins can transmit DrmInfoEvent to Java layer.
Although DrmInfoEvent has several entries, current implementation
can only convey integer and String. This change enables plugins
uto propagate a hashmap to Java layer. The hashmap can have
one or more Strings and one byte array as value.

Changes are made by Sony Corporation.

bug: 10459159

Change-Id: I5f2bfb43b676863ef4d220fd4ef1e48777e92752
(cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
 2013-08-23 18:02:40 -07:00
Jeff Brown
61d806c76a Merge "Docs changes pursuant to API review feedback." into klp-dev 2013-08-24 00:47:16 +00:00
Jeff Brown
511cd35fcc Docs changes pursuant to API review feedback. 
Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
 2013-08-23 17:44:47 -07:00