Stan Chesnutt
44a8fe1f54
am 0b87a637: am f3b88c7a: Merge "Simplistic fix for initialization race" into klp-dev
...
* commit '0b87a6373c4f92e81e5375ec59474588e820ef92':
Simplistic fix for initialization race
2013-09-06 16:57:50 -07:00
Stan Chesnutt
f3b88c7a42
Merge "Simplistic fix for initialization race" into klp-dev
2013-09-06 23:52:33 +00:00
Jeff Brown
7dd2d19725
Emit a more meaningful cause for watchdog restarts.
...
Print the real thread name and a better indication of where the
hang was detected.
Bug: 10646480
Change-Id: Ic94742d0db08b8531cfd1429bb0026d6c30b779d
2013-09-06 16:23:54 -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
Sreeram Ramachandran
dd2fc86db7
am 086a36f5: am 1aa3202b: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
...
* commit '086a36f5a9d498c0aee789fe50e4d4dde6457c52':
Minor fixes: Add a missing "break" and some cosmetic fixes.
2013-09-06 15:42:51 -07:00
Robert Greenwalt
ecd0db5a73
Merge "Setting MTU size for specific network." into klp-dev
2013-09-06 22:42:10 +00:00
Sreeram Ramachandran
1aa3202b1b
Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
2013-09-06 22:37:21 +00: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
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
Stan Chesnutt
8183aac3eb
Simplistic fix for initialization race
...
The monkey run described in the bug report hits this server at a
vulnerable point, and the RuntimeException causes a subsequent NPE.
Note that I'm making this fixup CL "blind", as monkey running on
my platform (mantaray) doesn't show this specific failure.
http://b/9438025
Change-Id: I8e16cf5cfc21dcf3061f31b0741525881bbf9724
2013-09-06 13:57:16 -07:00
Mathias Agopian
84e6ccf790
am e669c7ac: am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev
...
* commit 'e669c7aca3c02b9991d5a1cfcad40b5ae48faab2':
tweak the electron beam animation a bit
2013-09-06 13:46:22 -07:00
Dianne Hackborn
2949d1af93
am 5e615ee5: am a4796d51: Merge "Fix to show correct duration." into klp-dev
...
* commit '5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424':
Fix to show correct duration.
2013-09-06 13:46:18 -07:00
Mathias Agopian
52a5096f7c
Merge "tweak the electron beam animation a bit" into klp-dev
2013-09-06 19:16:37 +00:00
Dianne Hackborn
a4796d51f6
Merge "Fix to show correct duration." into klp-dev
2013-09-06 18:48:02 +00:00
Dianne Hackborn
d6d54a4694
Fix to show correct duration.
...
Change-Id: I1032d90d5b7bf39006b20f3374104421dcc53305
2013-09-06 11:46:43 -07:00
Wink Saville
4fea0413c1
Tighten test for warm sim and add more debug.
...
- Require a non-204 response multiple times before declaring a
redirected error and hence a warm sim.
- If there is no connection or dns don't declare its a warm-sim.
- Add printing of the http headers to try to get more information
if we still get a false positive result.
Bug: 9972012
Change-Id: Ic115685cdbbe39c2b4de88b128eaf8d2ea96b45c
2013-09-06 09:54:24 -07: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
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
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
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
Christopher Tate
48103dc3f9
am abe49daf: am 8fe79f66: Merge "Turn off verbose wakeup-alarm stats" into klp-dev
...
* commit 'abe49dafa0de201520589249083a5274d16b5287':
Turn off verbose wakeup-alarm stats
2013-09-05 23:51:56 -07:00
Mathias Agopian
97f0aa6f8a
tweak the electron beam animation a bit
...
we make the "beam" vanish in the center of the screen.
Bug: 10641933
Change-Id: I61fdb4d46e9f62dc80d65356a884dff0b177384a
2013-09-05 18:58:51 -07:00
Amith Yamasani
cd57b4950f
am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev
...
* commit '3d27c9f973b1dd35ed457785b452851316cdca8a':
Remove unused APIs and rename others based on API review
2013-09-05 17:33:19 -07:00
Christopher Tate
8fe79f666d
Merge "Turn off verbose wakeup-alarm stats" into klp-dev
2013-09-05 23:13:20 +00:00
Matthew Williams
56dbf8f236
Fix broken javadocs
...
Change-Id: Ibf7f2ed92919efd36fffa963447b1a443c0bb9db
2013-09-05 15:58:24 -07:00
Amith Yamasani
f1eebfc2cf
Merge "Remove unused APIs and rename others based on API review" into klp-dev
2013-09-05 22:48:17 +00:00
Dianne Hackborn
6e8bd7234b
am de93f124: am d67f18cf: Merge "Fix crash when dump() is called on ReceiverList" into klp-dev
...
* commit 'de93f124bc6c76cdc75c980cb9e4b261db1ac040':
Fix crash when dump() is called on ReceiverList
2013-09-05 15:23:09 -07:00
Dianne Hackborn
d67f18cf93
Merge "Fix crash when dump() is called on ReceiverList" into klp-dev
2013-09-05 22:18:58 +00:00
Christopher Tate
95b58e251c
Turn off verbose wakeup-alarm stats
...
They have served their purpose.
Bug 10112313
Change-Id: Ia88c350c5b51bdd29f23f491b47e4188770b1ea0
2013-09-05 14:31:52 -07:00
Wink Saville
67c3821926
Do not change NetworkInfo.DetailedState.
...
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.
Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.
Bug: 10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
2013-09-05 12:02:25 -07:00
Vinit Deshapnde
5261c9772f
am 76998d55: am b402fb2f: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
...
* commit '76998d552c1f8a83500c313d79e43cdd2de590b7':
Rename LinkInfo to LinkQualityInfo
2013-09-05 10:56:21 -07:00
Vinit Deshapnde
b402fb2fdd
Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
2013-09-05 17:50:19 +00:00
Amith Yamasani
d304af6989
Remove unused APIs and rename others based on API review
...
Restrictions challenge is only to be used by device admins.
Bug: 10461761
Change-Id: I3db1249e2ce99f386602de59ed930302bb0a97fb
2013-09-05 09:30:23 -07:00
Svetoslav
162b5fbdca
am b966605a: am c5c203d6: Merge "Print API updated." into klp-dev
...
* commit 'b966605a2884e9a92f060c69a9b82e051e2e798a':
Print API updated.
2013-09-04 22:40:19 -07:00
Svetoslav
c5c203d6ef
Merge "Print API updated." into klp-dev
2013-09-05 05:36:51 +00:00
Evans Thomas
880e5d486e
Fix crash when dump() is called on ReceiverList
...
Bug: 9750621
Change-Id: Ie203bc008747cd2def5839e64b27a2f98dbc6950
2013-09-04 21:10:12 -07:00
Svetoslav
773f54de3d
Print API updated.
...
1. Removed the updatePrinters API on PrinterDiscoverySession.
Now re-adding a printer updates it.
2. Added getTrackedPrinters() API to allow a print service to
figure out which printers' state should be tracked by the
service.
3. Removed the APIs on PrintDocumentInfo that describe the
layout of the content as they are not needed. For example,
if the print attributes passed in layout require landscape
mode, the the app should just create a PDF page with the
wider side up and draw its content in portrait. The printer
will then rotate the page.
Change-Id: Idd72c6e9c129e8b17eef1236573a99773f8ff0a2
2013-09-04 21:06:12 -07:00
Dianne Hackborn
1703c54a0e
am 021a138b: am 8144585c: Merge "Fix issue #10422349 : Limit/change the battery history data in batterystats" into klp-dev
...
* commit '021a138bdc0a8d1561cd7a429936afb8983c68b0':
Fix issue #10422349 : Limit/change the battery history data in batterystats
2013-09-04 18:32:16 -07:00
Dianne Hackborn
49021f5f79
Fix issue #10422349 : Limit/change the battery history data in batterystats
...
Don't include history in real checkins; have a new compact option
for bug reports.
Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
2013-09-04 18:03:40 -07:00
Chong Zhang
9a465a92f0
am 411af374: am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev
...
* commit '411af374f9a2fbfb8a88565afdc8fa9ddb7148a9':
wifi-display: add a global setting to force WPS config method
2013-09-04 15:14:32 -07:00
Chong Zhang
0df62d47c7
am 954b3b86: am 919559d4: Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev
...
* commit '954b3b86610ee2df6161ee96afb9df66d98abb9c':
wifi-display: disable WFD IE when Wifi display is turned off
2013-09-04 15:14:29 -07:00
Chong Zhang
dbb0b824a7
Merge "wifi-display: add a global setting to force WPS config method" into klp-dev
2013-09-04 22:07:05 +00:00
Chong Zhang
919559d447
Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev
2013-09-04 22:06:45 +00:00
Vinit Deshapnde
6a2d32597a
Rename LinkInfo to LinkQualityInfo
...
This change renames the LinkInfo objects to LinkQuailtyInfo. The API is
still hidden; but it can be accessed via reflection.
Bug: 10342372
Change-Id: Ieccea87c467ceae5d7f76298b137573f67396cd6
2013-09-04 14:11:24 -07:00
Dianne Hackborn
353f12d915
am f9be242a: am 3cd28adc: Merge "Fix issue #10427108 : Google+ has long running process" into klp-dev
...
* commit 'f9be242afa3c72a95538205b2cdd690f6c4174f1':
Fix issue #10427108 : Google+ has long running process
2013-09-04 13:26:20 -07:00
Dianne Hackborn
3cd28adc5d
Merge "Fix issue #10427108 : Google+ has long running process" into klp-dev
2013-09-04 20:22:27 +00:00
Tom O'Neill
7275ecc509
am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev
...
* commit '70c2dd932bd585ed578ea684db06f17c4e5d24d3':
Add LocationManager.MODE_CHANGED_ACTION broadcast
2013-09-04 07:21:16 -07:00