drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,632 Commits 1 Branch 0 Tags
Commit Graph

85632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
06f01326df am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit 'd0c6ccbafdebc73d03cf3cd47f02f9f6c78a69ff':
  Move NetworkPolicy from apps to UID.
 2012-09-15 16:12:04 -07:00
Jeff Sharkey
a6bb5cd8d2 am ee100445: Updating public API. 
* commit 'ee100445b7c1f8789d1c8ff7d4ae2d28656657db':
  Updating public API.
 2012-09-15 16:12:00 -07:00
Jeff Sharkey
d57f7dc464 am b3571a6c: Merge "Fix build" into jb-mr1-dev 
* commit 'b3571a6ca8877181695ddbd916c2be73625e5a99':
  Fix build
 2012-09-15 16:11:56 -07:00
Elliott Hughes
cbcf02a84c am edf60d3d: Fix up symbols.xml. 
* commit 'edf60d3d0ab0b9e14c023ecf7aacf72c480dec24':
  Fix up symbols.xml.
 2012-09-15 16:11:53 -07:00
Elliott Hughes
fdd1b6597b am c3ff72f5: Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
* commit 'c3ff72f5bd5896ad2584e0cc0582cbd2ad8191f2':
  Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
 2012-09-15 16:11:49 -07:00
Elliott Hughes
138ab322cf am 08153ee0: Switch DateUtils and Time over to using the CLDR for all week and month names. 
* commit '08153ee01e6aa67061f628bc3fed66c6400dfd1c':
  Switch DateUtils and Time over to using the CLDR for all week and month names.
 2012-09-15 16:11:45 -07:00
Elliott Hughes
c3fb4a1668 am 23321b88: Merge "Use ICU\'s CLDR data for "AM" and "PM" strings." into jb-mr1-dev 
* commit '23321b88578a4b4438e7563ff7616b98a1c1a520':
  Use ICU's CLDR data for "AM" and "PM" strings.
 2012-09-15 16:11:38 -07:00
Elliott Hughes
8b1109a9ff am c12d642f: Merge "Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"" into jb-mr1-dev 
* commit 'c12d642f040d6ea3e87d0ba187085bcdd11c2978':
  Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"
 2012-09-15 16:11:32 -07:00
Elliott Hughes
0e29ed2ed5 am a8deafb4: Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev 
* commit 'a8deafb4a68a0bdac2b5008f0f43c6645af2caf3':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-15 16:11:29 -07:00
Christopher Tate
5bae602cbb am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '2892dfbeafec5315d05fb6ceabeaee73b88f5ff0':
  Fix default population of wifi settings
 2012-09-15 16:11:25 -07:00
Daniel Sandler
2dd7cb6f6a am 8dd9206a: Fix NPE in rotation lock QS. 
* commit '8dd9206abbca6d143e3874abf46eca67f5340b31':
  Fix NPE in rotation lock QS.
 2012-09-15 16:11:22 -07:00
Geremy Condra
81953a3437 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:18 -07:00
Eino-Ville Talvala
8df3b2b398 Camera: Document face detection confidence recommendations. 
Bug: 7108023
Change-Id: I9de583254d127f9c1f702b7ed159a7080bcbfd25
 2012-09-15 14:32:14 -07:00
Jeff Sharkey
d0c6ccbafd Move NetworkPolicy from apps to UID. 
For multi-user devices, switch to storing policy per-user instead of
per-app.  Also watch for user added/removed broadcasts to clean up
policies and apply global restrictions.

Bug: 7121279
Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
 2012-09-14 23:00:27 -07:00
Jeff Sharkey
ee100445b7 Updating public API. 
Change-Id: I7b549af9af5cee21600fb356a411794320e84c56
 2012-09-14 21:57:38 -07:00
Jeff Sharkey
b3571a6ca8 Merge "Fix build" into jb-mr1-dev 2012-09-14 21:16:03 -07:00
Christopher Tate
5f9c4c475f Fix build 
(Deprecation changes are considered API changes.  I knew that.)

Change-Id: I58da073875efc77b833fa55ce15541fd48c5d335
 2012-09-14 21:15:29 -07:00
Elliott Hughes
edf60d3d0a Fix up symbols.xml. 
These dependent changes removed things from public.xml that have
since been moved to symbols.xml, so we need to remove them again.

Bug: 6811501
Change-Id: I1b333a5d3174de9b90039dcebbadcef65e8ae7b8
 2012-09-14 20:22:17 -07:00
Elliott Hughes
c3ff72f5bd Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
(cherry-pick of 47a0539ecaf7d7a15008704bd89f748aebf85d47.)

Conflicts:

	core/res/res/values/public.xml

Bug: 6811501
Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
 2012-09-14 20:22:17 -07:00
Elliott Hughes
08153ee01e Switch DateUtils and Time over to using the CLDR for all week and month names. 
(cherry-pick of 99c406e42ba154584070ca7ec100e8be7ff8a800.)

Conflicts:

	core/res/res/values-fa/donottranslate-cldr.xml
	core/res/res/values/public.xml

Bug: 6811501
Change-Id: I2ad9608ae34804e02c6b0271197e96611df12b0a
 2012-09-14 20:22:17 -07:00
Jim Miller
08b2b6bfe2 Fix keyguard timeout dialog messages 
This fixes an issue where the attempt count was incorrect.  We now show the
dialog *after* reporting the failed attempt.

This also fixes an issue where the text wasn't being reset in the password dialog
of keyguard.

Fixes bugs 7170545 and 7120895

Change-Id: Iba2009705373758acca6e10bd670eb34744bece9
 2012-09-14 19:15:45 -07:00
Elliott Hughes
23321b8857 Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev 2012-09-14 18:56:15 -07:00
Elliott Hughes
c12d642f04 Merge "Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"" into jb-mr1-dev 2012-09-14 18:54:30 -07:00
Elliott Hughes
a8deafb4a6 Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev 2012-09-14 18:53:14 -07:00
Christopher Tate
2892dfbeaf Merge "Fix default population of wifi settings" into jb-mr1-dev 2012-09-14 17:59:00 -07:00
Christopher Tate
6f5a9a9652 Fix default population of wifi settings 
Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.

A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.

Also updated the namespace used to refer to wifi settings from the
Wifi Service.  These changes are cosmetic, but they do eliminate a
number of runtime log messages.

Bug 7153671

Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
 2012-09-14 17:57:35 -07:00
Daniel Sandler
8dd9206abb Fix NPE in rotation lock QS. 
Bug: 7172228
Change-Id: I3ac35e18fe7ce5af13ee4c54dabae80df696c819
 2012-09-14 17:29:21 -07:00
Elliott Hughes
4af85345e7 Use ICU's CLDR data for "AM" and "PM" strings. 
This brings DateUtils and Time in sync with bionic, icu, WebKit,
DateFormatSymbols, Formatter, and SimpleDateFormat. And specifically
means that DateUtils now knows how to say "AM" and "PM" in Japanese.

Bug: 6719054

(cherry-pick of b12b61a88a029730b1f2b006ff914c9c719f3942.)

Conflicts:

	core/res/res/values/public.xml

Change-Id: Ic1a811621a0ec338abd77458ac2046577f87c1e4
 2012-09-14 17:10:00 -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
049005e3c5 am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '1c9894aa7f0eaa9ab562c1c384317456fd99dd6c':
  Remove AndroidKeyStore from API
 2012-09-14 16:59:13 -07:00
Irfan Sheriff
0c913cda95 am 42496826: Merge "Fix suspend bugs" into jb-mr1-dev 
* commit '424968261fb346859a7ac796703527f2e34c0a84':
  Fix suspend bugs
 2012-09-14 16:56:14 -07:00
Kenny Root
1c9894aa7f Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 2012-09-14 16:55:47 -07:00
Irfan Sheriff
424968261f Merge "Fix suspend bugs" into jb-mr1-dev 2012-09-14 16:54:09 -07:00
Elliott Hughes
7f269e4682 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.

(cherry-pick of d3c01012d8d329e541214e8207272ab5cc9ca004.)

Change-Id: I9fd131108ad82bacb9434ffbf40eddfde3459862
 2012-09-14 16:52:33 -07:00
Elliott Hughes
fea122e6f0 Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" 
This reverts commit f3875177254bb116028f8200c88d0b7a8ff9ab1c

This change conflicts with the intended cherry-pick of https://googleplex-android-review.googlesource.com/214542

Change-Id: If383a01dbd5de92d3e1d3ea2d55de15f7ccf9340
 2012-09-14 16:49:55 -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
Irfan Sheriff
633fe60b78 Fix suspend bugs 
Listen to screen broadcast all the time to avoid situations of losing
this information when wifi is turned on and off

Avoid duplicate suspend commands to driver

Bug: 7156907
Change-Id: I162b7ba249ae8925119a534229045965c0c13d1f
 2012-09-14 16:42:58 -07:00
Elliott Hughes
42e7af25c0 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:01 -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
d063b14dc8 am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit '0b62fa234d2e3580b1f04cb9c4a6a308be99a5ae':
  Send more information to verifiers
 2012-09-14 16:04:32 -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
873d49a670 am 8b681cb8: Some formatting missed in the previous patch 
* commit '8b681cb8813454aac8a626bf3d7adaa8beca4d75':
  Some formatting missed in the previous patch
 2012-09-14 15:22:52 -07:00
Svetoslav Ganov
8b681cb881 Some formatting missed in the previous patch 
Change-Id: I299090ca67b1d90cf75a46dc85b13970d32511e5
 2012-09-14 15:20:45 -07:00
Svetoslav Ganov
acbea737ec 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:19:06 -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