Jay Shrauner
1f168fd438
am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
...
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
Catch ActivityNotFoundException in quick contacts badge
2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93
Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
2014-03-03 21:56:18 +00:00
Jonathan Dixon
7c01f9f7ab
am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
...
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d
am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
...
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a
DO NOT MERGE: Fix build after checkThread fix merge to master
...
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.
Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba
2014-03-03 18:48:00 +00:00
Primiano Tucci
f4e2723244
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
...
This is going to be used by pagecycler tests.
See: b/10629847
Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 2442675002
2014-03-03 18:01:53 +00:00
John Spurlock
5237a792aa
am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
...
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
Doc fixups to ContentResolver, MediaRouter.
2014-03-03 16:57:22 +00:00
John Spurlock
8c44c394bf
Doc fixups to ContentResolver, MediaRouter.
...
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
2014-03-03 10:14:41 -05:00
Yorke Lee
535c9e74d3
Catch ActivityNotFoundException in quick contacts badge
...
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650
2014-03-01 18:07:22 +00:00
John Spurlock
998735652d
am ba231fca: Fix bad @links in PendingIntent.java
...
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
Fix bad @links in PendingIntent.java
2014-02-19 13:44:14 +00:00
John Spurlock
ba231fcabf
Fix bad @links in PendingIntent.java
...
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
2014-02-18 13:19:57 -05:00
John Spurlock
76ecd66a6d
am 0196e561: Fix typo in ImageView.java
...
* commit '0196e561f280e6cc361442036da277a630e68558':
Fix typo in ImageView.java
2014-02-03 17:18:37 +00:00
John Spurlock
0196e561f2
Fix typo in ImageView.java
...
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
2014-02-03 09:00:35 -05:00
John Spurlock
e05190eae7
am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
2014-01-14 19:50:38 +00:00
Dave Platt
62bac75d67
am 76e5ca81: Fix descriptor leak after accepting connections
...
* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
Fix descriptor leak after accepting connections
2014-01-07 11:49:54 -08:00
Dave Platt
e966e5774a
am 02f042dd: Fix socket descriptor leak from Zygote to child app
...
* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
Fix socket descriptor leak from Zygote to child app
2014-01-07 11:49:49 -08:00
Dave Platt
76e5ca81b3
Fix descriptor leak after accepting connections
...
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.
Bug: 11805817
(cherry picked from commit 3e7305c6bf
2014-01-06 14:31:28 -08:00
Dave Platt
02f042ddd9
Fix socket descriptor leak from Zygote to child app
...
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket. The LocalSocket.close()
routine will no longer do so.
Bug: 12114500
(cherry picked from commit 70ef29b04e
2014-01-06 13:59:20 -08:00
John Spurlock
3390018c6b
Docfixes: three typos and escape */*.
...
Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5
2014-01-06 11:44:42 -05:00
quddusc
34dbf7c323
am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
...
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-20 23:10:28 +00:00
quddusc
9072110b82
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
...
Bug: 6804017
Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
2013-12-20 14:55:09 -08:00
Scott Main
efe1023328
am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
...
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
fix typos bug: 11693951 bug: 12118617
2013-12-18 00:41:23 +00:00
Scott Main
688342f98c
fix typos
...
bug: 11693951
bug: 12118617
Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
2013-12-17 13:55:02 -08:00
Katie McCormick
f85470e686
am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
...
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
Doc update: Update package summary for BT.
2013-12-13 00:55:59 +00:00
Katie McCormick
f2041ac56e
Doc update: Update package summary for BT.
...
Fixes:
b/8584860
Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
2013-12-12 15:42:00 -08:00
Scott Main
cf5ed42f0b
am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 01:00:46 +00:00
Scott Main
df75bdcc55
rewrite intent guide and add doc with intents supported by platform apps
...
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
2013-12-10 15:53:37 -08:00
Katie McCormick
484b57a565
am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
...
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840
Doc updates: Javadoc fixes
...
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
John Spurlock
e18b673a4d
am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
...
* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
Fix @see link in DocumentsContract docs.
2013-11-25 23:29:29 +00:00
John Spurlock
330dfa7d11
Merge "Fix @see link in DocumentsContract docs." into klp-docs
2013-11-25 23:25:36 +00:00
John Spurlock
4e55a7e8c5
Fix @see link in DocumentsContract docs.
...
DocumentsContract#createDocument is hidden.
Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
2013-11-25 18:00:07 -05:00
John Spurlock
56979b2234
am 125d133b: Fix bad @see links in Intent.java.
...
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
Fix bad @see links in Intent.java.
2013-11-25 18:39:33 +00:00
John Spurlock
125d133bcc
Fix bad @see links in Intent.java.
...
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
2013-11-25 11:58:37 -05:00
Jeff Brown
263c431017
am ce468a35: Stop wifi display discovery when no longer needed.
...
* commit 'ce468a35b388ca46578934706b38dbae94941643':
Stop wifi display discovery when no longer needed.
2013-11-21 19:43:00 -08:00
Jeff Brown
ce468a35b3
Stop wifi display discovery when no longer needed.
...
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.
Suspend wifi display scans while connecting or connected to a remote
display. This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.
Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.
Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.
Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.
Improved connection reliability somewhat. It seems that discovery must
already be in progress in order for a connection attempt to succeed.
Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.
Bug: 11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
2013-11-21 19:32:59 -08:00
Newton Allen
27bd44401e
am 28029658: Fix javadoc typo in SparseArray.
...
* commit '2802965888566244d8642ba32775b7b2a3cec655':
Fix javadoc typo in SparseArray.
2013-11-21 23:28:28 +00:00
Newton Allen
2802965888
Fix javadoc typo in SparseArray.
...
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit ebb47950f2
2013-11-21 23:12:32 +00:00
Svetoslav Ganov
b95d6f549b
am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
...
* commit 'c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
Revert "PreferenceFragment showing the breadcrumb when not needed."
2013-11-21 12:15:22 -08:00
Svetoslav Ganov
4ed5f502a7
am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
...
* commit '4d159661f453fa5d04698033f4bf6256f0d3c16a':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
2013-11-21 12:15:19 -08:00
Svetoslav Ganov
c6db9c3b37
Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
2013-11-21 20:12:13 +00:00
Svetoslav Ganov
4d159661f4
Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
2013-11-21 20:12:02 +00:00
Dirk Dougherty
a40420c9c1
am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs
...
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
Doc change: Change description for BRAND. Bug:11431921
2013-11-21 19:49:46 +00:00
Svetoslav Ganov
8fc552e695
Revert "PreferenceFragment showing the breadcrumb when not needed."
...
This reverts commit 7db97b0a29
2013-11-21 19:36:22 +00:00
Svetoslav Ganov
68e7f13e22
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
...
This reverts commit 2b8795a9db
2013-11-21 19:33:53 +00:00
Dirk Dougherty
491b40d752
Doc change: Change description for BRAND.
...
Bug:11431921
Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
2013-11-21 09:31:40 -08:00
Christopher Tate
e370534267
am b0183f0a: Harden against transiently unavailable backup transports
...
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
Harden against transiently unavailable backup transports
2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Now with 100% less build break.
Bug 11716868
Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
2013-11-19 11:24:46 -08:00
Sascha Prueter
c7f7d1bf18
am f7044fec: Merge "Trying to unbreak build..." into klp-dev
...
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
Trying to unbreak build...
2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506
Trying to unbreak build...
...
Revert "Harden against transiently unavailable backup transports"
This reverts commit 8f98252afe
2013-11-19 06:51:21 +00:00
