Commit Graph

35663 Commits

Author SHA1 Message Date
Siva Velusamy
d41b852f92 Fix Javadoc error
This fixes an error introduced with I180296d413a18301cead1c8e3212de2bd0c7e32d

Change-Id: I06512a0fb388738fae5bba5540189095f23f1e2a
2013-10-29 14:11:11 -07:00
Alex Klyubin
be7f22b7a8 am 07873e3a: am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit '07873e3a72da254bcdf965f6fa76bdcc800ef511':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:56:18 -07:00
Alex Klyubin
07873e3a72 am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit '569220399841ae1a3fd62a1b77fa087bca2ee0f3':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:54:15 -07:00
Alex Klyubin
5692203998 am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:50:28 -07:00
Svetoslav
76a8dac72d am 3a855ba5: am a4e1f435: am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev
* commit '3a855ba5225ac6b3f85397713178a7b85069057a':
  Share pack historical sorting using wrong keys.
2013-10-29 08:35:07 -07:00
Svetoslav
3a855ba522 am a4e1f435: am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev
* commit 'a4e1f4352149b15fa64e9b85928f0b1ba00486fb':
  Share pack historical sorting using wrong keys.
2013-10-29 08:31:39 -07:00
Svetoslav
201006fd35 am 37a5a1ea: am 330c6be9: am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev
* commit '37a5a1ea8743d439db7bc0384f62589537c21d28':
  Not show share targets that cannot be launched.
2013-10-29 08:30:33 -07:00
Svetoslav
37a5a1ea87 am 330c6be9: am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev
* commit '330c6be9dcda95cc2666c2a0cb62ea1cfc9a1d48':
  Not show share targets that cannot be launched.
2013-10-29 08:28:05 -07:00
Przemyslaw Szczepaniak
97cd647fcd TTS API: Replace "voice id" with "voice name"
"Voice id" and "voice name" are both used to reference a voice in a
speech synthesis request. Voice id was a random integer, where
voice name is human readable string, that provides more debug
information and readability. Also, it's expected that voice name
will stay consistent, and won't change during the life of the speech
connection. Though, it may disappear.

Change-Id: I180296d413a18301cead1c8e3212de2bd0c7e32d
2013-10-29 10:56:06 +00:00
Svetoslav
27f592df8c Share pack historical sorting using wrong keys.
The ActivityChooserModel keeps a history of the last fifty
share targets and based on past usage orders the targets in
the UI. The soring implementation is using a map for improving
performance. However, the activities in this map were keyed
on the package name but there maybe more that one share
target per package. Thus, the sorting was generating bad
results. Now the unique component name is used.

bug:11195578

Change-Id: I8c7018fea168b7253ddbe57b477028368726e75e
2013-10-28 18:43:08 -07:00
Svetoslav
baeabb65e1 Not show share targets that cannot be launched.
This changes filters out share targets that we cannot start
because the target does not properly implement the SEND protocol
and has either share target activity hidden or requires a
permission to launch it. Also the code that launches the share
target activity catches the runtime exception and shows an error
message. Note that being able to launch an activity in a moment
of time is not a guarantee that one can do that latter. Hence,
being able to launch an activity while building the share UI
does not guarantee that one can launch it when selecting the
share target.

bug:11402139

Change-Id: Id35732510755b2eeb9eccacc046d289c2f2ee856
2013-10-28 16:26:47 -07:00
Alex Klyubin
019118af67 Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
The method was returning all supported cipher suites instead of the
default ones only. The default list of cipher suites actually used by
sockets created by this factory is not affected by this issue.

Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
2013-10-28 16:24:33 -07:00
Svetoslav
cdc2280a6e am 0298ebb2: am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
* commit '0298ebb2db5b7c24d68fd3817b11e2f887471d0c':
  Complete implementation of the advanced print options.
2013-10-28 15:15:45 -07:00
Svetoslav
0298ebb2db am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev
* commit '60fb1e28375b9c0dc7505214f3ab33bdd38f7aa8':
  Complete implementation of the advanced print options.
2013-10-28 15:12:26 -07:00
Dianne Hackborn
93a8c8e028 am a03fc2c2: am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev
* commit 'a03fc2c296407a42a568f9acfdf63cb5db536cb4':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
2013-10-28 15:08:58 -07:00
Svetoslav
714ba34556 Merge "Complete implementation of the advanced print options." into klp-dev 2013-10-28 22:07:03 +00:00
Dianne Hackborn
a03fc2c296 am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev
* commit '1c18c5d40ce7004d28aaa8f6c6713efcc72e6706':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
2013-10-28 15:05:46 -07:00
Dianne Hackborn
3a702cb5d7 Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev 2013-10-28 21:59:18 +00:00
Alan Viverette
222cd91d23 Merge "Add support for using ColorStateList in GradientDrawable" 2013-10-28 20:36:57 +00:00
Alan Viverette
519494e207 Add support for using ColorStateList in GradientDrawable
BUG: 11373225
Change-Id: Ie62f1546e8694822aadafe9ef1e57ce458a363d6
2013-10-28 13:15:39 -07:00
Svetoslav
b4fda13476 Complete implementation of the advanced print options.
1. Implemented the advanced printer options integration. Now a print service
    may declare an advanced print options activity which may be launched by
    the user if the current printer supports advanced print options. These options
    are visible only to the print service that added them and it is the only party
    that will interpret the options.

2. Fixed a couple of bugs in the saved print jobs parsing. One was that if there
    are more than one page range, a half of the print job properties was not
    properly parsed. The other was that the media size constructor was using
    incorrect argument order, thus creating a media size with wring width.

3. Fixed and edge case where old print jobs and their docs can get stuck in
    the spooler. If the app did not write the requested pages we were not showing
    an error message, rather just finish the activity without canceling the print
    job and this print job is stuck in the spooler. Now we show an error message
    and the user may retry, cancel. If the user cancels the print job is also
    cancelled, thus no leftover in the spooler.

4. Fixed the background color of the print dialog to meet UX spec.

bug:11241800

Change-Id: I352440bc86aec824a805883fc9579d96a06d11e6
2013-10-28 11:44:07 -07:00
Christopher Tate
c95bae5010 am 13c4645b: am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
* commit '13c4645bfc9c3bbd6ae2508ef8cc24412fe237c8':
  Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:22:26 -07:00
Jeff Sharkey
8b5f453a82 am de9b66fe: am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit 'de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9':
  Extra to always show advanced devices.
2013-10-25 18:22:22 -07:00
Christopher Tate
13c4645bfc am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
* commit 'f7d74870db6f8b1275d4b93268b0210e351647b3':
  Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:17:56 -07:00
Jeff Sharkey
de9b66fee1 am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
  Extra to always show advanced devices.
2013-10-25 18:17:52 -07:00
Christopher Tate
6364c26cb3 Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 2013-10-26 00:42:01 +00:00
Christopher Tate
109e4db471 Un-deprecate setInexactRepeating() and tweak docs
Bug 10461371

Change-Id: Ic62a0e94c83c0c7b50e21a7bee19c3d92255d231
2013-10-25 16:55:36 -07:00
Dianne Hackborn
e77187d018 Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
Change-Id: I005e4dc763deafac95dc3aa6261c06d1808fdaff
2013-10-25 16:32:41 -07:00
Jeff Sharkey
96c620595b Extra to always show advanced devices.
Also always lower-case extension to extract MIME type correctly,
we may want to fix in MimeUtils at some point.

Bug: 11354402
Change-Id: I77d0c06a663cd0c4320c41553ff1980b6f9a7778
2013-10-25 16:30:54 -07:00
Christopher Tate
dde92b755f am 66f6fa7b: am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev
* commit '66f6fa7b3617ecf919d879157d6205321685db61':
  DOCS: document API 19+ Alarm Manager API and behaviors
2013-10-25 16:14:04 -07:00
Christopher Tate
66f6fa7b36 am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev
* commit '9a9952571a19eb849558885215b0bbe564a9176c':
  DOCS: document API 19+ Alarm Manager API and behaviors
2013-10-25 15:06:15 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
2013-10-25 15:01:34 -07:00
Christopher Tate
6aedab9b64 Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 2013-10-25 21:59:41 +00:00
Marco Nelissen
2165718153 Merge "Add a method to set a list of uids for a wake lock" into klp-dev 2013-10-25 21:55:55 +00:00
Svetoslav Ganov
9f598351ca am 01b1e661: am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev
* commit '01b1e66135f3e727be47300510443d149d8679cd':
  Update the documentaton of the android.print package.
2013-10-25 14:04:56 -07:00
Christopher Tate
062bce7d87 DOCS: document API 19+ Alarm Manager API and behaviors
Bug 9941334

Change-Id: I65473bd62f7113c74ed6277d61db56c76441ff1b
2013-10-25 13:59:44 -07:00
Svetoslav Ganov
01b1e66135 am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev
* commit '1aae2c477772378b447da35717882c76aa39fb67':
  Update the documentaton of the android.print package.
2013-10-25 13:54:07 -07:00
Svetoslav Ganov
2a40da558b Merge "Update the documentaton of the android.print package." into klp-dev 2013-10-25 20:48:45 +00:00
Jeff Sharkey
92706ac8df am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev
* commit 'd8a81d06e4649498b3ba884f2e5443701e13d023':
  Skip writing PFD status when comm is closed.
2013-10-25 13:28:50 -07:00
Jeff Sharkey
d8a81d06e4 am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev
* commit 'fd38f940f4283f9ea68142185426a7cf45d58ae0':
  Skip writing PFD status when comm is closed.
2013-10-25 13:25:31 -07:00
Jeff Sharkey
ac4bf7fd9a Merge "Skip writing PFD status when comm is closed." into klp-dev 2013-10-25 20:17:03 +00:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
2013-10-25 12:49:55 -07:00
Dianne Hackborn
27dab38891 am f09a1b88: am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev
* commit 'f09a1b88ae87abb750bda62f97fce1633a9cab7d':
  Fix issue #11290095: Parcel change causing crashing in KLP...
2013-10-25 12:26:43 -07:00
Dianne Hackborn
f09a1b88ae am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev
* commit 'aec8fbb354621dc49a4ac971a64706bee01e5806':
  Fix issue #11290095: Parcel change causing crashing in KLP...
2013-10-25 12:21:26 -07:00
Dianne Hackborn
df033aed9d Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 2013-10-25 19:15:45 +00:00
Jeff Sharkey
d99f9caba6 Skip writing PFD status when comm is closed.
If the remote side of PFD has already written a status message, then
they've also closed their end of the comm FD, and we're going to
EPIPE if we try sending our own status.  So, skip writing status if
a remote status is present.

Only one end of the openFile() comm socket needs to be blocking,
otherwise detachFd() would end up blocking forever.

Bug: 11385467
Change-Id: I346d40cc1ca4a6683cec4c2d2b7db2b32ac94a55
2013-10-25 11:34:35 -07:00
Svetoslav Ganov
4d4c66dd38 Update the documentaton of the android.print package.
bug:10551786
bug:10551697
bug:10705082
bug:10741641
bug:11318976
bug:10550979
bug:10551761

Change-Id: I46ceb66a69b6d32d6b417356178f67f2e25e891a
2013-10-25 11:33:34 -07:00
Dianne Hackborn
8aee64d18b Fix issue #11290095: Parcel change causing crashing in KLP...
...when reading from empty byte[]

Better handling of empty bundles and parcels.

Change-Id: Ie9182e43a52b8f163e8fb20bd1d110e0832683e6
2013-10-25 10:41:50 -07:00
Adam Powell
1e9a2478be am 098bc61f: am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev
* commit '098bc61f6c1683c63c5210025e1f65bb41d41037':
  Hide TransitionManager default transition methods
2013-10-25 10:11:32 -07:00
Adam Powell
098bc61f6c am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev
* commit 'fd08694e403b6bc06f66a31a9dda14b30695f309':
  Hide TransitionManager default transition methods
2013-10-25 10:08:26 -07:00