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
Sandeep Siddhartha
05203c1e4b
Fixing build break
...
Change-Id: I89d1416b356423ee795f01b4c3200bcaa3ec8389
2013-09-06 18:04:48 -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
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
1d0b177754
Fix issue #10560472 : ApplicationInfo.manageSpaceActivity not parsed...
...
...correctly with overloaded resources
Change this attribute and a few other manifest attributes to allow
them to change based on platform SDK version.
Clean up a little more the whole mess with native vs. java config
bit masks.
Change-Id: Ia0baa3f7aed00bcb432701bcf99a9112124d6519
2013-09-06 14:02:54 -07:00
Igor Murashkin
a94db2467c
am 76f883e0: am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
...
* commit '76f883e0a8fa6d62110824399440c779a1b68874':
Binder: Log exceptions originating from the binder stub for oneway calls
2013-09-06 13:46:16 -07:00
Igor Murashkin
76f883e0a8
am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
...
* commit '034052b352e14054d5271ea42985497f6b101b4f':
Binder: Log exceptions originating from the binder stub for oneway calls
2013-09-06 13:38:23 -07:00
Timothy Knight
a2815faad7
Camera2: Minor docs fix.
...
Bug: 10639270
Change-Id: Ic5b046a8f8e1c8be83f010e05247914c61b3674b
2013-09-06 13:34:30 -07:00
Adam Powell
0cb1a791d8
am 435f957f: am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
...
* commit '435f957feef58a4d393f06f57db3975633d6b09b':
Add a minimum timeout for double-tap in GestureDetector
2013-09-06 13:32:51 -07:00
Adam Powell
435f957fee
am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
...
* commit 'b8b017cb6879352aee015ba24e9bfd05cc094e74':
Add a minimum timeout for double-tap in GestureDetector
2013-09-06 12:58:24 -07:00
Sandeep Siddhartha
c73c178374
Add permission checks and unhide the Hotword recognition APIs
...
- Also tweak the API a little to send an intent on hotword being
recognized.
Change-Id: I8a3fedaec4e1db595ed058089734d25c7957111e
2013-09-06 12:34:03 -07:00
Dmitry Grinberg
34b0f92613
Allow L2CAP sockets
...
Change-Id: Icb498e6c0430789b6168bec3beb1d4650e4f1238
2013-09-06 12:27:12 -07:00
Igor Murashkin
034052b352
Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
2013-09-06 18:32:30 +00:00
Adam Powell
b8b017cb68
Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
2013-09-06 18:15:28 +00:00
Jeff Sharkey
a53fb42f31
am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev
...
* commit '775bdbdb11ad790f45ee66e8fdf8dca3fcba969a':
Provide calling package to ContentProviders.
Separate root and document management.
2013-09-06 09:53:04 -07:00
Wink Saville
010bbf42ff
am 78f4e10b: am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit '78f4e10bb206acc13095a6daeb880751fb28f313':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:53:01 -07:00
Mikhail Naganov
1b48d039d3
am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev
...
* commit '708d279a16e2c937da1a2247195eb738906c199e':
Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
2013-09-06 09:52:49 -07:00
Michael Wright
6484c0e013
Merge addition of supports-input tag into master
...
aapt has been moved out of f/b which caused merged conflicts in
the original commit
Conflicts:
tools/aapt/Command.cpp
Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b
2013-09-06 09:39:34 -07:00
Jeff Sharkey
775bdbdb11
am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev
...
* commit 'dc8d704899716e97e59af8b6fe5f549e0229eda6':
Provide calling package to ContentProviders.
Separate root and document management.
2013-09-06 09:29:05 -07:00
Jeff Sharkey
dc8d704899
Merge changes I7277880e,Ia5584bd6 into klp-dev
...
* changes:
Provide calling package to ContentProviders.
Separate root and document management.
2013-09-06 16:26:34 +00:00
Wink Saville
78f4e10bb2
am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit 'a1d6a9b474ba095860838c6ed3e72f8d9f5058cd':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:25:32 -07:00
Wink Saville
a1d6a9b474
am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit 'fc7a146b82774514bad4bc307489ece7ac27ee50':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:19:40 -07:00
Wink Saville
fc7a146b82
am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:17:19 -07:00
Wink Saville
50f864480d
am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:12:50 -07:00
Matthew Williams
abc1d89950
Merge "Fix broken javadocs"
2013-09-06 16:06:17 +00:00
Jeff Sharkey
911d7f411f
Provide calling package to ContentProviders.
...
The calling package is important for ContentProviders that want to
grant Uri permissions as a side effect of operations, so offer it
through a new API. Validates the provided package against the
calling UID before returning.
Bug: 10626527
Change-Id: I7277880eebbd48444c024bcf5f69199133cd59e4
2013-09-06 08:08:18 -07:00
Jeff Sharkey
a61dc8e03e
Separate root and document management.
...
Two hidden intents for managing roots and documents, used to support
Downloads UI. Touching an item tries launching as MANAGE_DOCUMENT
first before falling back to VIEW. Provide MIME type for roots.
Bug: 10446265, 10531347, 10599641
Change-Id: Ia5584bd6ce3e5a9b0048e8caf1447e3053664413
2013-09-06 08:08:18 -07:00
Mikhail Naganov
708d279a16
am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev
...
* commit '498a5f5488446e1d5914f5d335ee02572c6201d1':
Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
2013-09-06 07:41:08 -07:00