Commit Graph

28588 Commits

Author SHA1 Message Date
Kenny Root
a4fd2fbfae am 358c6ffd: am ae19d2ca: am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit '358c6ffdd43df805f5fb19c8d935c1e9220b95e5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 20:32:17 +00:00
Kenny Root
ae19d2cac8 am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit 'f3e3a7fd3cc386b69ae3275b829ddd0d137fcac5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 13:27:13 -07:00
Kenny Root
f3e3a7fd3c am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit '7ad514094c8abbea0cc61b72fcaf0e23d6124b0d':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 13:25:35 -07:00
Kenny Root
7ad514094c Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey." 2013-03-12 20:05:09 +00:00
Craig Mautner
b11b1f2679 Remove old show/hide messages on new ime
The previous show/hide messages in the queue were still trying
to be honored even after a new ime was attached.

Fixes bug 8263462.

Change-Id: Ie85369346cd3f843389a8e7837f5d97b56885309
2013-03-12 11:25:54 -07:00
Alex Klyubin
ac5eb03a7c Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
This is to accept both the "transparent" and "opaque" ECC private
keys. "Transparent" keys provide structured access to their key
material -- these are instances of ECPrivateKey. "Opaque" private
keys are not required to provide structured (or even any) access to
their key material -- these are instances of PrivateKey.

Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
2013-03-12 10:33:13 -07:00
Jean Chalard
92291eea07 Merge changes I3109a482,Ia5e25738
* changes:
  Final small cleanup.
  Actually change the place where updateSelection is called
2013-03-12 06:20:59 +00:00
Jean Chalard
79386f4f54 Merge changes Ia01aee85,I17bd91a1
* changes:
  Add a SpanWatcher to catch programmatic selection changes
  Initial refactoring to move updateSelection to a better place
2013-03-12 06:18:39 +00:00
Jean Chalard
5fbbf2318f Merge "Preparatory cleanups in MetaKeyKeyListener" 2013-03-12 06:16:51 +00:00
Michael Wright
607dcedaa6 am 63530ed8: am b13eb3e7: Merge changes I674b9804,If2d2e37b into jb-mr2-dev
* commit '63530ed8dad1ca77d5f9d20f2af7317611cdd175':
  Add touch navigation input source
  Add InputDevice#isFromSource convenience method
2013-03-12 01:09:01 +00:00
Michael Wright
e7a9ae8ba0 Add touch navigation input source
Bug: 8276741
Change-Id: I674b9804bf9ae76d694ae7073b54a7d43474a43c
2013-03-11 17:58:22 -07:00
Michael Wright
74e4156e5c Add InputDevice#isFromSource convenience method
Change-Id: If2d2e37bc3fff5a862ea3652c7ef9778018e7ecc
2013-03-11 16:02:51 -07:00
Jim Miller
ab80d007de am 33c05985: am e70748e7: Merge "Remove unnecessary userid check" into jb-mr2-dev
* commit '33c05985102ea9a357263bba8e6a3789d20f6ba7':
  Remove unnecessary userid check
2013-03-11 23:02:47 +00:00
Jim Miller
e70748e78b Merge "Remove unnecessary userid check" into jb-mr2-dev 2013-03-11 22:58:33 +00:00
Elliott Hughes
0d193dbabf am a1900187: am 7b517a5c: am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
* commit 'a1900187868c094341062024578bbfaed3c1b238':
  Fix DateFormat k and h, and implement K and H for the first time.
2013-03-11 22:39:55 +00:00
Elliott Hughes
7b517a5c79 am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
* commit 'a45bafc2f025d2ef513f3e3dcac162ba6a95d575':
  Fix DateFormat k and h, and implement K and H for the first time.
2013-03-11 15:35:36 -07:00
Elliott Hughes
a45bafc2f0 am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
* commit 'c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9':
  Fix DateFormat k and h, and implement K and H for the first time.
2013-03-11 15:27:52 -07:00
Elliott Hughes
7a89f62877 Fix DateFormat k and h, and implement K and H for the first time.
Bug: 8359981
Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
2013-03-11 14:49:44 -07:00
Elliott Hughes
a0f5813a30 am d3cc3bbc: am a31d507e: am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"
* commit 'd3cc3bbcdce86f809d4b511e74c46ae3beeafc20':
  use Calendar in DateUtils format method
2013-03-11 21:28:57 +00:00
Elliott Hughes
a31d507e3f am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method"
* commit '7c1e8dbd3159c88df27d24aa2699358ee139d49b':
  use Calendar in DateUtils format method
2013-03-11 14:21:17 -07:00
Elliott Hughes
7c1e8dbd31 am 21d3f294: Merge "use Calendar in DateUtils format method"
* commit '21d3f294831f7a15c5e746b3dae3e6ec0de883a8':
  use Calendar in DateUtils format method
2013-03-11 14:19:14 -07:00
Jim Miller
f083324b42 Remove unnecessary userid check
This removes code used to verify the userid's were consistent, which
is no longer needed.

Fixes bug 8167800

Change-Id: I592e4bc1158fb7775bd31ae8a26c1782b60f0fa0
2013-03-11 13:57:12 -07:00
Jeff Sharkey
345fc4cc92 am 1b48ecf8: am f2afddb5: Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev
* commit '1b48ecf89a13a104820d5ccf52ba7f5dd622d3a6':
  Handle corrupt RegisteredServicesCache XML.
2013-03-11 20:31:51 +00:00
Jeff Sharkey
f2afddb57d Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev 2013-03-11 20:25:48 +00:00
Jeff Sharkey
293ad6c674 Handle corrupt RegisteredServicesCache XML.
Avoid getting stuck in infinite loop.

Bug: 8360183
Change-Id: I81728dcfbc35b456c9166cf5c5175d0a376df56f
2013-03-11 13:22:29 -07:00
Lorenzo Colitti
07e455011f am 5343658d: am 36818c41: Merge "Unbreak documentation build." into jb-mr2-dev
* commit '5343658d5c77723026a12bc5dde96bab787d469b':
  Unbreak documentation build.
2013-03-11 19:51:50 +00:00
Craig Mautner
68811a4521 Add debug for b/8263462.
Look for race condition in soft input method attach.

For bug 8263462.

Change-Id: Id0609a743d57ab685c036372100ddd33819bff03
2013-03-11 12:39:20 -07:00
Lorenzo Colitti
574b00a362 Unbreak documentation build.
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b
2013-03-12 04:30:47 +09:00
Sungmin Choi
9a2ada418b use Calendar in DateUtils format method
The DatePickerDialog is using DateUtils to format the dialog's title
and the DateUtils class does not work with dates outside to the
specified range.
For example, if user selects 2038-03-07, DatePickerDialog shows
1902-01-30 on Title.
The reason for the DateUtils class not being able to format dates
outside the range of 1902 and 2036 is because internally it is using
the Time class which does not support such dates.
To fix it, use Calendar class in DataUilts format method.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1902 or after 2037
5. update wrong date on Title

Bug: https://code.google.com/p/android/issues/detail?id=13050
Change-Id: I003266765751b5c340426af84daef271f39f771e
2013-03-11 11:24:02 -07:00
Lorenzo Colitti
5aae35d8e4 am 13d1c27e: am de965891: Merge "Always specify an interface for host routes." into jb-mr2-dev
* commit '13d1c27eda1465eeb09823eb9e82fccf67dfb15e':
  Always specify an interface for host routes.
2013-03-11 17:27:11 +00:00
Lorenzo Colitti
c4de19e250 am 6d8086aa: am 1dc2ff66: Merge "RouteInfo changes." into jb-mr2-dev
* commit '6d8086aa0d00397fec8afc8649399cdfcbc378c3':
  RouteInfo changes.
2013-03-11 17:23:43 +00:00
Lorenzo Colitti
de96589113 Merge "Always specify an interface for host routes." into jb-mr2-dev 2013-03-11 17:22:25 +00:00
Lorenzo Colitti
1dc2ff66af Merge "RouteInfo changes." into jb-mr2-dev 2013-03-11 17:19:00 +00:00
Selim Gurun
0d8ab21576 am f2fb1730: am 2bf500ed: Merge "Add a delimiter between scheme and host" into jb-mr2-dev
* commit 'f2fb17308efc89664cabdbcae4ef89f9033c7dbe':
  Add a delimiter between scheme and host
2013-03-11 16:33:23 +00:00
Selim Gurun
2bf500ed21 Merge "Add a delimiter between scheme and host" into jb-mr2-dev 2013-03-11 16:25:38 +00:00
Lorenzo Colitti
e167135976 Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
2013-03-08 16:41:25 -08:00
Lorenzo Colitti
45b9a5bb93 RouteInfo changes.
- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
2013-03-08 16:41:25 -08:00
Elliott Hughes
a850a3a87e am b9230f3c: am d6875e33: am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."
* commit 'b9230f3c312068bf603f8657db8e818f6a78ddc4':
  Improve DateFormat.format.
2013-03-09 00:23:40 +00:00
Elliott Hughes
d6875e3334 am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."
* commit '2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
  Improve DateFormat.format.
2013-03-08 16:21:21 -08:00
Elliott Hughes
2cb314ebc7 am e0cd3c19: Merge "Improve DateFormat.format."
* commit 'e0cd3c19546a00db3db706c6a993fb0e3bd00b3a':
  Improve DateFormat.format.
2013-03-08 16:18:42 -08:00
Chet Haase
fbde30877f Merge "add getAlpha() to Drawable" 2013-03-08 23:52:33 +00:00
Amith Yamasani
f2ac737a40 am 36047905: am 515b51f8: Merge "Make account cloning API public" into jb-mr2-dev
* commit '36047905ed42561bf88e27aa2a6b3b5199459d61':
  Make account cloning API public
2013-03-08 23:41:29 +00:00
Chet Haase
b1af7f3d4b add getAlpha() to Drawable
Drawable has setAlpha(int), but no getAlpha() (although some subclasses have added the
method). This makes it more tedious to use the property. For example, animations that wish to
animate this property must explicitly give it a start value since this value cannot be queried
from the object.

The trick is that setAlpha(int) is abstract, only implemented by subclasses. We cannot take this
approach for getAlpha(), as we would break all subclasses of Drawable until they implemented the
method. Instead, we'll add a default method which returns an invalid value, making it easier for
clients of the method to detect whether the value is valid.

All subclasses of Drawble in frameworks have been changed to add an override of getAlpha() when
appropriate.

Issue #7485875 Drawables is missing getAlpha()

Change-Id: I06b6e35f1a56d202838eca44759c85c82595020a
2013-03-08 15:40:28 -08:00
Amith Yamasani
515b51f83f Merge "Make account cloning API public" into jb-mr2-dev 2013-03-08 23:35:31 +00:00
Amith Yamasani
c8a1ff4036 Make account cloning API public
Change-Id: If48d93dab49afcaaa301a5a3aa514f3d4dd3bab8
2013-03-08 15:29:55 -08:00
Christopher Tate
28d4f210f1 Merge "DO NOT MERGE - Full backup/restore now handles OBBs sensibly" into jb-mr2-dev 2013-03-08 23:26:36 +00:00
Christopher Tate
294b512eca DO NOT MERGE - Full backup/restore now handles OBBs sensibly
OBB backup/ restore is no longer handled within the target app
process.  This is done to avoid having to require that OBB-using
apps have full read/write permission for external storage.

The new OBB backup service is a new component running in the
same app as the already-existing shared storage backup agent.
The backup infrastructure delegates backup/restore of apps'
OBB contents to this component (because the system process
may not itself read/write external storage).

From the command line, OBB backup is enabled by using new
-obb / -noobb flags with adb backup.  The default is noobb.

Finally, a couple of nit fixes:

- buffer-size mismatch between the writer and reader of chunked
  file data has been corrected; now the reading side won't be
  issuing an extra pipe read per chunk.

- bu now explicitly closes the transport socket fd after
  adopting it. This was benign but triggered a logged
  warning about leaked fds.

(Cherrypicked)

Change-Id: I471f6348abcccb7bf1e1710b7beda9f23de53e14
2013-03-08 15:08:10 -08:00
Elliott Hughes
8326b9a429 Improve DateFormat.format.
Add support for the 'c' format character, required in many non-English locales.
Reimplement 'c' and 'E', and 'L' and 'M', so they correctly interpret 5-count
pattern characters.

Replace the old incorrect class documentation with a pointer to the
well-maintained libcore equivalent and the Unicode UTS to which these two
implementations are supposed to conform.

Deprecate the useless constants for pattern characters. No one sane is going
to write MONTH + MONTH + MONTH + MONTH instead of "MMMM".

Correct the documentation for getLongDateFormat and getMediumDateFormat.

Also fix DateUtils.getStandaloneMonthString for LENGTH_SHORTEST.

Tests are in https://android-review.googlesource.com/53291.

Change-Id: I4dda8b18070f05ccdc11c1f0a9381a9d233db4e8
2013-03-08 15:06:14 -08:00
Chet Haase
f287913e4a Merge "Revert "add getAlpha() to Drawable"" 2013-03-08 23:01:17 +00:00
Chet Haase
9f48f3eeae Revert "add getAlpha() to Drawable"
This reverts commit a227f59691

Change-Id: Ic6337b773a2a2302d9d3f84fa9ff9c2324edd2ae
2013-03-08 23:00:02 +00:00