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

4495 Commits

Author SHA1 Message Date
Philip Milne
ac4b97caed am eed8f06f: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-26 17:30:20 -07:00
Jeff Sharkey
bdfce2ec05 First step towards cleaning up Global settings. 
Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
 2012-09-26 17:18:49 -07:00
Brian Carlstrom
b66e30373c am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 
* commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a':
  Reverting public setSoWriteTimeout
 2012-09-26 16:09:29 -07:00
Brian Carlstrom
cd4a962a84 am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
  Reverting public setSoWriteTimeout
 2012-09-26 16:09:03 -07:00
Brian Carlstrom
13987fb432 Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 2012-09-26 16:05:00 -07:00
Brian Carlstrom
992f238d13 Reverting public setSoWriteTimeout 
This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
 2012-09-26 15:48:21 -07:00
Philip Milne
4118012da9 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos() 
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
 2012-09-26 11:29:25 -07:00
John Spurlock
46193469c7 am ccb06b41: am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 
* commit 'ccb06b415747655cead26a801560b68ee061b870':
  Dream metadata now specified using an xml-resource.
 2012-09-26 11:20:17 -07:00
John Spurlock
5d15dd08bf am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 
* commit 'fddedc94b77812ea13afe8cae32ad27d7266f787':
  Dream metadata now specified using an xml-resource.
 2012-09-26 11:17:55 -07:00
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource. 
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
 2012-09-26 12:44:39 -04:00
Jeff Brown
9da4d74477 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev 
* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:11:25 -07:00
Jeff Brown
3476cb8ec2 am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev 
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:05:56 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev 
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:03:11 -07:00
Svetoslav Ganov
2a0168615b am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
  Adding a global accessibility action to open quick settings.
 2012-09-25 16:52:34 -07:00
Brian Carlstrom
1802935852 am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 
* commit 'bee07548d5beda94538a211383847889dc9224b5':
  Add a static generator that takes a Socket Write Timeout Argumanet
 2012-09-25 16:50:47 -07:00
Svetoslav Ganov
53da9d3490 am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
  Adding a global accessibility action to open quick settings.
 2012-09-25 16:49:56 -07:00
Brian Carlstrom
71d2b48fb7 am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
  Add a static generator that takes a Socket Write Timeout Argumanet
 2012-09-25 16:48:02 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00
Svetoslav Ganov
e20a177d3f Adding a global accessibility action to open quick settings. 
1. Added APIs for opening the quick settings to the StatusBarManagerService
   and the local StatausBarManager. The new APIs are protected by the old
   EXPAND_STATUS_BAR permission.
   Renamed the expand* and collapse* non-public APIs that are expanding
   the notifications to expandNotifications* collapseNotifications* to
   better convey what they do given that this change adds
   expandQuickSettings* and collapseQuickSettings*.
   Added a global action to the accessibility layer to expand the quick
   settings which is calling into the new status bar manager APIs.

bug:7030487

Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
 2012-09-25 16:07:59 -07:00
Alon Albert
fd901f735c Add a static generator that takes a Socket Write Timeout Argumanet 
Use it from AndroidHttpClient

Bug: 6693087
Change-Id: I08648e441a6431d0944caaec0db516a26671f2a5
 2012-09-25 15:33:28 -07:00
Jeff Brown
bf6f6f9de7 Update references to migrated global settings. 
Fixed one setting that was migrated but not marked deprecated.

Removed a hidden setting that is no longer used by the new
power manager service.

Bug: 7231172
Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7
 2012-09-25 15:27:51 -07:00
Brian Carlstrom
a1b0baf1e5 am df44266d: am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout 
* commit 'df44266daa8e50e2a0686bf3fc49454518eabb0f':
  Unhide SSLCertificateSocketFactory.setSoWriteTimeout
 2012-09-25 13:29:44 -07:00
Brian Carlstrom
ce536f3b47 am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout 
* commit '5e21bf934b2a71b595deb9856a2044eea4dbce86':
  Unhide SSLCertificateSocketFactory.setSoWriteTimeout
 2012-09-25 12:50:11 -07:00
Jean-Baptiste Queru
6d5efebc56 am 5ef9cb68: Merge into jb-mr1-dev 
* commit '5ef9cb68c3bb639990abc0eadcaaaa61164ad628':
  Hiding a method for JB-MR1
 2012-09-25 12:48:55 -07:00
Jean-Baptiste Queru
3d9e6909fd am 1b242759: Merge into jb-mr1-dev 
* commit '1b242759763205fa529591738cbe213fcc25150e':
  Adding support for new 'uid2445' column in Calendar's Events table.
 2012-09-25 12:46:53 -07:00
Jean-Baptiste Queru
df3131e466 am 6fb2514c: Merge into jb-mr1-dev 
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923 am 8f862ef9: Add NfcBarcode technology API. 
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
  Add NfcBarcode technology API.
 2012-09-25 12:46:22 -07:00
Brian Carlstrom
5e21bf934b Unhide SSLCertificateSocketFactory.setSoWriteTimeout 
Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
 2012-09-25 10:38:52 -07:00
Jean-Baptiste Queru
5ef9cb68c3 Merge into jb-mr1-dev 
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
 2012-09-25 09:46:23 -07:00
Jean-Baptiste Queru
1b24275976 Merge into jb-mr1-dev 
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
 2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
6fb2514cdf Merge into jb-mr1-dev 
Change-Id: I1baab28b12364213673ed7992207ad198491f286
 2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7 Add NfcBarcode technology API. 
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
 2012-09-25 09:22:16 -07:00
Kristian Monsen
7f37a5028f am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev 
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
  Hiding a method for JB-MR1
 2012-09-25 07:32:36 -07:00
Kristian Monsen
7ae8a60f35 Merge "Hiding a method for JB-MR1" into jb-mr1-dev 2012-09-25 07:29:13 -07:00
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1 
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
 2012-09-24 19:11:30 -04:00
Sara Ting
db8f10ad9a Merge "Adding support for new 'uid2445' column in Calendar's Events table." into jb-mr1-dev 2012-09-24 16:03:22 -07:00
Dianne Hackborn
4c0f678284 Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev 2012-09-24 15:08:31 -07:00
Martijn Coenen
ed50c00653 Merge "Add NfcBarcode technology API." into jb-mr1-dev 2012-09-24 15:01:20 -07:00
Dianne Hackborn
139748fd72 Fix issue #7215984: java.lang.RuntimeException: Unable to create... 
...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
  there is really no need to do so.
- Rework the settings provider client side cache code to not hold
  locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users.  We can't do one per
user, since the system property name space is limited with a fixed
size.  And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
 2012-09-24 14:15:14 -07:00
Martijn Coenen
0bec15ebed Add NfcBarcode technology API. 
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
 2012-09-24 14:01:40 -07:00
Sara Ting
4d6f90ea50 Adding support for new 'uid2445' column in Calendar's Events table. 
Bug:7029852
Change-Id: I4fdf86ba44f5c7bdcc55e8c2bdf664dddbe671f5
 2012-09-24 13:09:35 -07:00
Philip Milne
0014c0f64a am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 
* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
 2012-09-24 11:43:42 -07:00
Philip Milne
bc391d58c8 Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 2012-09-24 11:41:53 -07:00
Philip Milne
53fe756772 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" 
This reverts commit 2f6d8829524dfca3a77e9a57c3b9c3862209877d

Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
 2012-09-24 11:38:29 -07:00
Dianne Hackborn
308ac6c6e4 am 7451f15e: Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 
* commit '7451f15e7464fe8dd117b74c6dcff780785e0007':
  Fix issue #6926562: Ensure all multi-user cache files are managed correctly
 2012-09-24 11:08:46 -07:00
Dianne Hackborn
7451f15e74 Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 2012-09-24 11:07:26 -07:00
Philip Milne
2eba91d98f am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'b00df8e929f9ba865a95a7df3f949e6169332954':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:05:19 -07:00
Dianne Hackborn
556b09e184 Fix issue #6926562: Ensure all multi-user cache files are managed correctly 
Now we correctly iterate through the different user cache dirs.

Also update documentation to describe the new cache pruning behavior,
and deprecate the file modes for making files world readable/writable
which we really don't want people using any more.

Change-Id: I3708df3ddc697b1f5c511143cce7cc40a5a3d0bd
 2012-09-24 11:02:45 -07:00