Commit Graph

25106 Commits

Author SHA1 Message Date
Geremy Condra
32e49bb65a am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev
* commit '74a550fac7f30463c368bc01969a4fa57ac61791':
  Change verifyServerDomainAndCertificates to pass in a hostname.
2012-09-15 16:11:45 -07:00
Kenny Root
84193b198f resolved conflicts for merge of 1c9894aa to jb-mr1-aah-dev
Change-Id: Ia640fa6a88fc75ac919eb542c1263756a9c3229a
2012-09-14 17:43:38 -07:00
Geremy Condra
74a550fac7 Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 2012-09-14 17:07:33 -07:00
Kenny Root
1c9894aa7f Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 2012-09-14 16:55:47 -07:00
Geremy Condra
f743e54f2d Change verifyServerDomainAndCertificates to pass in a hostname.
This is required for cert pinning.

Change-Id: I16041f17e97d9ae592a2b809f6a8164268338d1b
2012-09-14 16:43:52 -07:00
Elliott Hughes
f49a31626b am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '9ceede6d7e250922e63b0d2c90403089f8736e0c':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:41:11 -07:00
Elliott Hughes
9ceede6d7e am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '086676a4a669b5d3a90c01e4d88ab8d628ca65f0':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:39:12 -07:00
Elliott Hughes
086676a4a6 am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:34:41 -07:00
Kenny Root
ce24985ad6 Remove AndroidKeyStore from API
Change-Id: Ibe09d78e5a5b86604f01144f344525bff94c2dde
2012-09-14 16:23:37 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use.
Applications using these fields and methods are just asking for i18n bugs.

Also @deprecate two int[]s that were never meant to be public.

Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
2012-09-14 16:06:50 -07:00
rich cannings
63eda54c9d am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev
* commit '0b62fa234d2e3580b1f04cb9c4a6a308be99a5ae':
  Send more information to verifiers
2012-09-14 16:04:30 -07:00
rich cannings
0b62fa234d Merge "Send more information to verifiers" into jb-mr1-dev 2012-09-14 16:02:29 -07:00
Svetoslav Ganov
f46519a97d am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev
* commit '3efa8babf581b107f63e29dedb56166e5db1bfdb':
  Adding accessibility events for touch and gesture detection states.
2012-09-14 15:18:53 -07:00
Svetoslav Ganov
3efa8babf5 Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 2012-09-14 15:16:27 -07:00
Svetoslav Ganov
77276b6085 Adding accessibility events for touch and gesture detection states.
1. Currently the system fires accessibility events to announce the
   start and end of a touch exploration gesture. However, such a
   gesture starts after we have decided that the user is not
   performing a gesture which is achieved by measuring speed of
   movement during a threshold distance. This allows an accessibility
   service to provide some feedback to the user so he knows that
   he is touch exploring.

   This change adds event types for the first and last touches
   of the user. Note that the first touch does not conincide with
   the start of a touch exploration gesture since we need a time
   or distance to pass before we know whether the user explores
   or gestures. However, it is very useful for an accessibility
   service to know when the user starts to interact with the
   touch screen so it can turn the speech off, to name one
   compelling use case.

   This change also provides event types for the start and end
   of gesture detection. If the user has moved over the threshold
   with a speed greater than X, then the system detects gestures.
   It is useful for an accessibility service to know the begin
   and end of gesture detection so it can provide given feedback
   type for such a gesture, say it may produce haptic feedback
   or sound that differs for the one for touch exploration.

   The main benefit of announcing these new events is that an
   accessibility service can provide feedback for each touch
   state allowing the user to always know what he is doing.

bug:7166935

Change-Id: I26270d774cc059cb921d6a4254bc0aab0530c1dd
2012-09-14 15:12:54 -07:00
Jatin Lodhia
206820357a am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev
* commit '836033d6502641a4631bdc5cbd2d57848561e7ca':
  Update account list on account picker activity resume
2012-09-14 14:44:51 -07:00
Jatin Lodhia
836033d650 Merge "Update account list on account picker activity resume" into jb-mr1-dev 2012-09-14 14:42:00 -07:00
rich cannings
13d428e830 Send more information to verifiers
Send package name, version code and the uid of the application requesting the
install to package verifiers.

Bug: 7164155
Change-Id: I2464dc5d4551f60b4f38f7982495a8920c83e1cd
2012-09-14 14:25:52 -07:00
Kristian Monsen
cdd2dd58d8 am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
* commit '4cb846b8defa298fe62e6420d1dcd7d8f65a1d74':
  Hiding some of the deprecated android.webkit API's
2012-09-14 14:03:59 -07:00
Kristian Monsen
4cb846b8de Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev 2012-09-14 14:01:37 -07:00
Jeff Sharkey
d0f5607e76 am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
  Actually move to Global settings.
2012-09-14 13:51:19 -07:00
Jeff Sharkey
04a34b3755 Merge "Actually move to Global settings." into jb-mr1-dev 2012-09-14 13:49:24 -07:00
Jeff Sharkey
e6e6197d7c Actually move to Global settings.
Also add better ConnectivityService logging.

Bug: 7157464
Change-Id: Ia235a7e62ed809240913c4782920c1410c7d597d
2012-09-14 13:47:51 -07:00
Jeff Sharkey
d3941f4c33 am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
* commit 'a043c2c0534afe418fc39bdb43bfaab394ba821a':
  Move to Global.NETSTATS and Global.NTP constants.
2012-09-14 13:17:46 -07:00
Jeff Sharkey
a043c2c053 Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 2012-09-14 13:15:16 -07:00
Jeff Sharkey
023c05a341 Move to Global.NETSTATS and Global.NTP constants.
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
2012-09-14 13:14:21 -07:00
Jim Miller
76d795c313 am f229e4d3: Add support for settings for lock widgets
* commit 'f229e4d3eb8f910c181f96416c6798f6f305a395':
  Add support for settings for lock widgets
2012-09-14 12:40:05 -07:00
Jim Miller
f229e4d3eb Add support for settings for lock widgets
Change-Id: Iade094c6f32a7653bdbbd4921d345d68f2443ff4
2012-09-14 12:31:24 -07:00
Michael Jurka
1733eb309b am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
* commit '95a2ff7cb40d5eb3ca6fe4df0282f45e63d76ae2':
  Adding a couple extras keys for keyguard widget selection
2012-09-14 12:23:46 -07:00
Michael Jurka
95a2ff7cb4 Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev 2012-09-14 12:20:08 -07:00
Svetoslav Ganov
bed49f9d58 am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
* commit 'e136a72810197029a01b4e30b2063d9993b7a9ad':
  Text layout in switch may be null when accessibility events are fired.
2012-09-14 11:39:39 -07:00
Christopher Tate
c1e27dc060 am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev
* commit '0dbc4108005445d241c5f6990000d25a09a8e00e':
  Fix Settings writes to a different user
2012-09-14 11:37:54 -07:00
Svetoslav Ganov
e136a72810 Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev 2012-09-14 11:37:15 -07:00
Svetoslav Ganov
b8c50e8e44 Text layout in switch may be null when accessibility events are fired.
1. The layout containing the text of a Switch is initialized on measure
   and if an accessibility event is fired before that then a NPE happens.

bug:7169419

Change-Id: Iee3c01ca9157d14d228c4ff33c0810507e0e25a7
2012-09-14 11:36:29 -07:00
Christopher Tate
0dbc410800 Merge "Fix Settings writes to a different user" into jb-mr1-dev 2012-09-14 11:35:19 -07:00
Jeff Brown
419822e22f am 2dc6af20: Merge "Fixup a comment." into jb-mr1-dev
* commit '2dc6af2082b93849b2e5519a8ae7504757286aa9':
  Fixup a comment.
2012-09-14 00:04:15 -07:00
Jeff Brown
2dc6af2082 Merge "Fixup a comment." into jb-mr1-dev 2012-09-14 00:01:06 -07:00
Jeff Brown
565f0425ba Fixup a comment.
Change-Id: I7b73f7e0f0aa903e5cd02d1cdb678e65a6d40e0c
2012-09-14 00:00:17 -07:00
Romain Guy
c4ea87e50d am 51d71003: Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev
* commit '51d71003e4211b273b8e00adf85389e91ea4bdff':
  Prevent crash when invalidating all Views Bug #7165793
2012-09-13 22:55:24 -07:00
Romain Guy
f84208faf8 Prevent crash when invalidating all Views
Bug #7165793

A ViewRootImpl's root view can be null. Check for this condition to
prevent an NPE invalidateWorld(). Other messages perform a similar
check to properly handle the case where mView == null.

Change-Id: I5bcfc41c48a469d38b21be74df2f6c715b0f9352
2012-09-13 22:50:18 -07:00
Christopher Tate
78d2a66ac1 Fix Settings writes to a different user
Oops.  Stacked bugs:  first, the desired user handle was not properly
being passed from the call() entry point to the database operations;
then on top of that, the client-side cache management was still
looking in the local user's cache for the data, so a request to read
a different user's settings would return the local user's instead if
that key was already known to the local user's cache.

Reads and writes of a different user's settings are now uncached,
so they're relatively much slower.  They're rare, however, so this
is not something to worry about unless we encounter a real world
case where it's a significant factor.

This CL also adds a bit of cross-user settings read/write testing
to the existing provider suite.  These new tests caught both the
known wrong-user-write bug and discovered the client-side cache
bug, so yay.

Finally, the existing wholesale mutual-exclusion approach would
deadlock in certain circumstances due to the fact that the
settings database creation code might have to call out to the
Package Manager while populating the bookmark/shortcut table,
and the Package Manager would then call back into the settings
provider in the course of handling that request.  The synchronization
regime has been significantly tightened up now: now the database
code [which is known to deal with concurrency itself] is allowed
to cope with multiple parallel openers of the same db; this
allows the settings provider to avoid calling out to other parts
of the system even implicitly while its internal lock is held.

Change-Id: Ib77d445b4a2ec658cc5c210830f6977c981f87ed
2012-09-13 19:15:54 -07:00
Svetoslav Ganov
0ae6039adc am 33aef98f: Allowing association between a view and its label for accessibility.
* commit '33aef98fd28dcac0a2ad37e7329afd3e666f5e0a':
  Allowing association between a view and its label for accessibility.
2012-09-13 18:47:06 -07:00
Alan Viverette
0f2d09fc59 am 0f755134: Revert "Add accessibility scroll actions to TabWidget"
* commit '0f7551341f7504632e4943c66d6a4fd504bf5a0e':
  Revert "Add accessibility scroll actions to TabWidget"
2012-09-13 18:41:53 -07:00
Svetoslav Ganov
33aef98fd2 Allowing association between a view and its label for accessibility.
1. For accessibility purposes it is important to be able to associate
   a view with content with a view that labels it. For example, if
   an accessibility service knows that a TextView is associated with
   an EditText, it can provide much richer feedback.

   This change adds APIs for setting a view to be the label for another
   one and setting the label for a view, i.e. the reverse association.

bug:5016937

Change-Id: I7b837265c5ed9302e3ce352396dc6e88413038b5
2012-09-13 18:41:40 -07:00
Alan Viverette
0f7551341f Revert "Add accessibility scroll actions to TabWidget"
This reverts commit 6053088884

Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80
2012-09-13 18:36:06 -07:00
Jatin Lodhia
8d16778efd Update account list on account picker activity resume
Activities which help select an account gather the list of accounts only during create and dont update it agian. When a user moves out of the account selection activity by clicking home page, deletes an accout in the background and comes back to the earlier accout selection activity, the deleted account still exists as an option. This cl fixes this by updating the account list on resume.

Bug: 7135608
Change-Id: Idc9a2fa6451b032310c0ad66f6db0e2f0967feeb
2012-09-13 18:23:10 -07:00
Adam Powell
c59d86ef15 am 83835b17: Merge "Break flings with opposing velocities" into jb-mr1-dev
* commit '83835b17f259fc38478c72b7f59b14796bbc622a':
  Break flings with opposing velocities
2012-09-13 17:26:39 -07:00
Adam Powell
83835b17f2 Merge "Break flings with opposing velocities" into jb-mr1-dev 2012-09-13 16:45:24 -07:00