Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,957 Commits 3 Branches 0 Tags
fdf4bbf2d0514f8ad56ebbf06b8ebdeebe1da82b
Commit Graph

34149 Commits

Author SHA1 Message Date
Narayan Kamath
fdf4bbf2d0 Revert "Allow SSL caches to be installed directly on SSLContexts." 
This reverts commit 25bef03cbf.

Breaks build with
 cannot access com.android.org.conscrypt.SSLClientSessionCache
class file for com.android.org.conscrypt.SSLClientSessionCache not found

Change-Id: I6a89b45d5e8c7547778d7485ed02006cd4679989
 2013-09-09 16:47:08 +00:00
Narayan Kamath
25bef03cbf Allow SSL caches to be installed directly on SSLContexts. 
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.

Change-Id: Ibfb4b99fa86bc0704674437d9b860531317d2bde
 2013-09-09 16:07:07 +00:00
Narayan Kamath
0033539a43 resolved conflicts for merge of ab98aec6 to master 
Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9
 2013-09-09 09:59:31 +01:00
Dianne Hackborn
ab98aec612 am 4b989781: Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit '4b98978157295c6e7ea21b70ffcf9edffc41f0e1':
  Work on issue #10130785: Restore silence and vibrate settings...
 2013-09-08 12:33:48 -07:00
Dianne Hackborn
4b98978157 Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-08 19:31:06 +00:00
Svetoslav Ganov
d0ff896789 am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 
* commit 'd8adcd219dab97682a808b1ba12cd6528e33505e':
  Printers for a disappearing print serivce incorrectly removed.
 2013-09-07 15:09:24 -07:00
Svetoslav Ganov
d8adcd219d am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 
* commit 'c72221242e560b4176e6fb9e3eec1c32cc1b96c3':
  Printers for a disappearing print serivce incorrectly removed.
 2013-09-07 15:07:09 -07:00
Svetoslav Ganov
c72221242e Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 2013-09-07 22:05:14 +00:00
Ying Wang
cc7754ee36 am 4700175a: am d57de6af: Fix docs build. 
* commit '4700175a2617b456c2b820d519750e80cda465fc':
  Fix docs build.
 2013-09-06 23:02:11 -07:00
Ying Wang
4700175a26 am d57de6af: Fix docs build. 
* commit 'd57de6afb8981dc1663d41a842ab7cdae93427a1':
  Fix docs build.
 2013-09-06 22:59:40 -07:00
Ying Wang
d57de6afb8 Fix docs build. 
Change-Id: I6fd0d711b2cc7726fdaa9119ee467ed6fab82de1
 2013-09-06 22:53:16 -07:00
Michael Wright
65ae4c6f79 am 8091f226: am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev 
* commit '8091f2262fe0774723694cea95a6f8b8785087e4':
  Remove tap to click from touch nav devices
 2013-09-06 19:07:29 -07:00
Michael Wright
aa1c5e4deb am d13fa001: am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev 
* commit 'd13fa0018b273f0db13154d520f7f0d11a2cb375':
  Special case game controller fallback keys for Japan
 2013-09-06 19:07:25 -07:00
Michael Wright
8091f2262f am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev 
* commit 'edaf6af16a5c33557a9c4ed00f9bebdac0dd83aa':
  Remove tap to click from touch nav devices
 2013-09-06 19:05:47 -07:00
Michael Wright
d13fa0018b am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev 
* commit '7b4f60deb2819496733c0c85c57c6236900fe0c2':
  Special case game controller fallback keys for Japan
 2013-09-06 19:05:44 -07:00
Michael Wright
edaf6af16a Merge "Remove tap to click from touch nav devices" into klp-dev 2013-09-07 02:04:46 +00:00
Michael Wright
7b4f60deb2 Merge "Special case game controller fallback keys for Japan" into klp-dev 2013-09-07 02:04:20 +00:00
Jeff Brown
c677ff8c3b am cbf2b02d: am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev 
* commit 'cbf2b02d6c288c49f5bdbcb70d87c44d26086ba4':
  Fix native crash when message queue quits.
 2013-09-06 18:41:43 -07:00
Jeff Brown
cbf2b02d6c am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev 
* commit '23a5f44c5a306b4a70821722a697da55cc3c5db8':
  Fix native crash when message queue quits.
 2013-09-06 18:39:09 -07:00
Jeff Brown
23a5f44c5a Merge "Fix native crash when message queue quits." into klp-dev 2013-09-07 01:34:52 +00:00
Sandeep Siddhartha
a4f0c01ae5 am ea6c0bcd: am 1cf2b91f: Merge "Fixing build break" into klp-dev 
* commit 'ea6c0bcd6bb0b4b426cff963db22327c62e73f76':
  Fixing build break
 2013-09-06 18:15:19 -07:00
Sandeep Siddhartha
ea6c0bcd6b am 1cf2b91f: Merge "Fixing build break" into klp-dev 
* commit '1cf2b91fe533d9e50bce6e5551ae26bccdb4a965':
  Fixing build break
 2013-09-06 18:13:44 -07:00
Jeff Brown
013cf847bc Fix native crash when message queue quits. 
Fix a race when quitting the looper's message queue that could
cause the mPtr field to be zeroed out and the native object to
be destroyed while still in use.

This happened due to an optimization that was intended to release
the native looper's file descriptor as soon as the last message
was processed rather than waiting for the finalizer to run.

Bug: 9726217
Change-Id: I695a9a657acfdb3ce65a5737ff20cd11113d15fa
 2013-09-06 18:07:12 -07:00
Sandeep Siddhartha
05203c1e4b Fixing build break 
Change-Id: I89d1416b356423ee795f01b4c3200bcaa3ec8389
 2013-09-06 18:04:48 -07:00
Dianne Hackborn
38ed2a471a Work on issue #10130785: Restore silence and vibrate settings... 
...in settings > sound

Add a new ContentProvider API to canonicalize URIs, so they can
be transported across backup/restore.

Change-Id: Ie5af3662f6822a32310e49c7f1e1ff084986c56e
 2013-09-06 16:39:59 -07:00
Robert Greenwalt
e52785e6a7 am 9234e15d: am ecd0db5a: Merge "Setting MTU size for specific network." into klp-dev 
* commit '9234e15d8d4d99b211e6bb5c199790a77cf36be7':
  Setting MTU size for specific network.
 2013-09-06 15:49:42 -07:00
Robert Greenwalt
9234e15d8d am ecd0db5a: Merge "Setting MTU size for specific network." into klp-dev 
* commit 'ecd0db5a7391e8234b3ea5d9e21c19f5d6589b0a':
  Setting MTU size for specific network.
 2013-09-06 15:44:24 -07:00
Robert Greenwalt
ecd0db5a73 Merge "Setting MTU size for specific network." into klp-dev 2013-09-06 22:42:10 +00:00
Aravind Akella
0e6a43ea9a am 3d6aa958: am fcf5809a: Merge "Sensor batching APIs for review." into klp-dev 
* commit '3d6aa9587d7e9718a1024fb5b2e75f2e9658e3eb':
  Sensor batching APIs for review.
 2013-09-06 15:39:19 -07:00
Aravind Akella
3d6aa9587d am fcf5809a: Merge "Sensor batching APIs for review." into klp-dev 
* commit 'fcf5809ad43669c2e765aa093a8356959469fd9c':
  Sensor batching APIs for review.
 2013-09-06 15:37:16 -07:00
Dianne Hackborn
1775ebb76f am b6459eb2: am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 
* commit 'b6459eb25f0593561389d7cb3da38a4f960cce14':
  Implement issue #10550827: watching gpu memory for occam_svelte
 2013-09-06 15:34:43 -07:00
Aravind Akella
fcf5809ad4 Merge "Sensor batching APIs for review." into klp-dev 2013-09-06 22:30:19 +00:00
Dianne Hackborn
b6459eb25f am 3e1fdd9e: Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 
* commit '3e1fdd9ed02f95fd2dfefc36b34754f2ede1a2af':
  Implement issue #10550827: watching gpu memory for occam_svelte
 2013-09-06 15:28:23 -07:00
sy.yun
9d9b74a900 Setting MTU size for specific network. 
Able to config network specific MTU size. Normally, the default size of MTU is 1500.
 US - ATT 1410, TMUS 1440, SPRINT 1422
 KR - SKT 1440, KT 1450, LGU+ 1428
 JP - KDDI 1420, SoftBank 1340
 CA - RGS 1430, FIDO 1430, MTS 1430, BELL 1358, SaskTel 1358
 AU - TEL 1400

Bug: 10195070
Change-Id: Ie18650b37a3d44af944f2dae4aa97c04fb12cd5e
 2013-09-06 15:26:19 -07:00
Dianne Hackborn
3e1fdd9ed0 Merge "Implement issue #10550827: watching gpu memory for occam_svelte" into klp-dev 2013-09-06 22:25:56 +00:00
Timothy Knight
772aeccb19 am 11c9168c: am b39b46bf: Merge "Camera2: Minor docs fix." into klp-dev 
* commit '11c9168c09b6796e47d0e342b0995f73d4e5a0e2':
  Camera2: Minor docs fix.
 2013-09-06 15:17:53 -07:00
Timothy Knight
11c9168c09 am b39b46bf: Merge "Camera2: Minor docs fix." into klp-dev 
* commit 'b39b46bf87bc16818e88c2773acff398fb80b836':
  Camera2: Minor docs fix.
 2013-09-06 15:15:02 -07:00
Aravind Akella
d405e0fc82 Sensor batching APIs for review. 
Change-Id: I34504e1a0856c2dfeceb69c808abdf3e805c5f1f
 2013-09-06 15:11:50 -07:00
Timothy Knight
b39b46bf87 Merge "Camera2: Minor docs fix." into klp-dev 2013-09-06 22:11:38 +00:00
Sandeep Siddhartha
bc7d392ef1 am c3360d2a: am b05b4086: Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 
* commit 'c3360d2a8b6d7b8e820c99844364be4f1fc83824':
  Add permission checks and unhide the Hotword recognition APIs
 2013-09-06 15:09:36 -07:00
Sandeep Siddhartha
c3360d2a8b am b05b4086: Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 
* commit 'b05b408614767fb60295830d6bf557b33252498e':
  Add permission checks and unhide the Hotword recognition APIs
 2013-09-06 15:06:47 -07:00
Dianne Hackborn
37c9943262 Implement issue #10550827: watching gpu memory for occam_svelte 
Well, it would work if the published file permissions gave the
system process access to them. :(

Change-Id: I99e0c506f52c212384b20a042dcdd35516cf49c2
 2013-09-06 15:06:04 -07:00
Sandeep Siddhartha
b05b408614 Merge "Add permission checks and unhide the Hotword recognition APIs" into klp-dev 2013-09-06 22:04:26 +00:00
Mike Lockwood
a038dd4356 am a8c0e363: am c8fb093a: Merge "Allow L2CAP sockets" into klp-dev 
* commit 'a8c0e3639b69efcf4232d0bba808cebeefc60789':
  Allow L2CAP sockets
 2013-09-06 14:56:30 -07:00
Mike Lockwood
a8c0e3639b am c8fb093a: Merge "Allow L2CAP sockets" into klp-dev 
* commit 'c8fb093a8970b78084f2b4505fc283ac9e24317b':
  Allow L2CAP sockets
 2013-09-06 14:53:53 -07:00
Svetoslav Ganov
4e4518383f Printers for a disappearing print serivce incorrectly removed. 
The code that removes printers for a disappearing print serivice was
using printer infos instead printer ids and also wrong map methods.

bug:10651739

Change-Id: Idb9ccdaad9a59b3b6d16b079b33afad56bc45255
 2013-09-06 14:50:22 -07:00
Mike Lockwood
c8fb093a89 Merge "Allow L2CAP sockets" into klp-dev 2013-09-06 21:50:05 +00:00
Dianne Hackborn
1d0d403bc5 am ce277b51: am 298cbe9c: Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 
* commit 'ce277b51475a53970f6cd2ff8456883884381cef':
  Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed...
 2013-09-06 14:38:21 -07:00
Dianne Hackborn
ce277b5147 am 298cbe9c: Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 
* commit '298cbe9c403f9c6c66cecf601cccfcfd82e50930':
  Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed...
 2013-09-06 14:35:43 -07:00
Dianne Hackborn
298cbe9c40 Merge "Fix issue #10560472: ApplicationInfo.manageSpaceActivity not parsed..." into klp-dev 2013-09-06 21:31:29 +00:00