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

84671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
38ba12cbdf Import translations. DO NOT MERGE 
Change-Id: I45ff6d7cc265f5125ee3c651613f558182717b69
Auto-generated-cl: translation import
 2012-09-13 12:07:20 -07:00
Guang Zhu
79d45660f2 dodging the @JavascriptInterface bullet 
The reason for not to fix the test instead with new annotation
is that it's preferable to have a single version that works for
all platforms.

This can be revisted once we have enough platforms released to
not to care about the older ones.

Change-Id: I42557f920702e5a65e39a3fea80533bd07b54367
 2012-09-13 12:03:10 -07:00
Baligh Uddin
cf6fa9f070 Import translations. DO NOT MERGE 
Change-Id: Ibc972f1a4f6689c335727a2115aaed3e47d7b339
Auto-generated-cl: translation import
 2012-09-13 11:49:24 -07:00
Adam Powell
1910c10ec6 am 8a788cbf: Fix build. 
* commit '8a788cbfe5570fadee7aea1a06f6eee2cb7ed341':
  Fix build.
 2012-09-13 11:47:45 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities. 
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
 2012-09-13 11:45:07 -07:00
Adam Powell
8a788cbfe5 Fix build. 
Add new permission constants to public api

Change-Id: Iedde8c43f3738b51b74a81b72e9a39f51b43fc9d
 2012-09-13 11:44:20 -07:00
Michael Jurka
d0c9b86bb4 am 86398b69: Merge "Fix crash in recents" into jb-mr1-dev 
* commit '86398b694697f504798ccda129df578e231e2274':
  Fix crash in recents
 2012-09-13 11:19:58 -07:00
Eino-Ville Talvala
caea2213d5 am f353f948: Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 
* commit 'f353f948a5867fb43c9ee1dbec1ebc93f91655ec':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
 2012-09-13 11:18:09 -07:00
Michael Jurka
86398b6946 Merge "Fix crash in recents" into jb-mr1-dev 2012-09-13 11:17:31 -07:00
Eino-Ville Talvala
f353f948a5 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 2012-09-13 11:15:15 -07:00
Michael Jurka
482f159dc4 Fix crash in recents 
Bug: 7128044

Change-Id: Icaec50ef9dfbc5da78d71925215c3363f58d7d3d
 2012-09-13 11:12:00 -07:00
Jason Sams
8a95803738 Fix bugs in grain where values could go out of bounds. 
Change-Id: Ib2cc3177424cf24bc81b75786dfd9be30fea5378
 2012-09-13 11:07:33 -07:00
Geremy Condra
ffa778fb79 am f60921d9: (-s ours) Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev 
* commit 'f60921d921947d7d40285f471a09b0478044c29c':
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
 2012-09-13 10:45:56 -07:00
Dianne Hackborn
128c046187 am e0013828: Merge "Bring back new permission organization." into jb-mr1-dev 
* commit 'e00138285f3673cc82f345d38aa134500ebafcc8':
  Bring back new permission organization.
 2012-09-13 10:43:54 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev 
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
 2012-09-13 10:42:22 -07:00
Dianne Hackborn
e00138285f Merge "Bring back new permission organization." into jb-mr1-dev 2012-09-13 10:40:55 -07:00
Katie McCormick
a231c3600b am fd2ccaff: am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev 
* commit 'fd2ccaffc7bb9e3b735438c461902cbeab759ace':
  Doc change: GCM changes
 2012-09-13 09:44:47 -07:00
Katie McCormick
fd2ccaffc7 am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev 
* commit 'd21b9a9e2192e1a1803c2a19290e6badc7f69caf':
  Doc change: GCM changes
 2012-09-13 09:41:57 -07:00
Katie McCormick
d21b9a9e21 am 2f140f96: Merge "Doc change: GCM changes" into jb-dev 
* commit '2f140f9692c3f8e8ae278839637ff5f72d145c60':
  Doc change: GCM changes
 2012-09-13 09:39:50 -07:00
Katie McCormick
2f140f9692 Merge "Doc change: GCM changes" into jb-dev 2012-09-13 09:36:48 -07:00
Kenny Root
5c86a33609 am aefd73d2: Merge "Try to avoid possible NPE" into jb-mr1-dev 
* commit 'aefd73d2b9f17a06f05346f302db1e393a7ece19':
  Try to avoid possible NPE
 2012-09-13 08:40:20 -07:00
Kenny Root
aefd73d2b9 Merge "Try to avoid possible NPE" into jb-mr1-dev 2012-09-13 08:38:26 -07:00
Kenny Root
0f001d3ee0 Try to avoid possible NPE 
For some reason .getParent() appears to be returning null for a data
directory. We don't need to use the parent; we can just use the path.

Bug: 7151733
Change-Id: I5e17cc14fe53669882329d67d8a7b4ec35b81104
 2012-09-13 08:36:49 -07:00
Jeff Sharkey
e2332dfc3b am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 
* commit 'cae22d83a7225c38ef6f51723e13d5741d1cd69b':
  Give DefaultContainerService all external storage.
 2012-09-13 01:34:30 -07:00
Jeff Sharkey
cae22d83a7 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 2012-09-13 01:31:04 -07:00
Jeff Sharkey
dfa45309e0 Give DefaultContainerService all external storage. 
Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc
 2012-09-13 01:04:15 -07:00
Dianne Hackborn
cd403fc031 Bring back new permission organization. 
Change-Id: I83e7dd06989ab7b0116bcff5ad52d36e01b851d1
 2012-09-13 00:24:38 -07:00
Daniel Sandler
b4e56edde6 Suppress ExpandHelper on quick settings. 
Bug: 7004997
Change-Id: I423de03022982d9f87451eb3fb5ffdca818cac8a
 2012-09-12 23:07:44 -07:00
Dianne Hackborn
d9b02bcf7f am f5736aa5: Merge "Fix build." into jb-mr1-dev 
* commit 'f5736aa50deb8ef22b380b2501a0407881464ddc':
  Fix build.
 2012-09-12 22:03:43 -07:00
Dianne Hackborn
f5736aa50d Merge "Fix build." into jb-mr1-dev 2012-09-12 22:00:32 -07:00
Dianne Hackborn
bd7057f777 Fix build. 
Change-Id: Ie655344e7752393b231f093beb7575def437cc77
 2012-09-12 21:58:25 -07:00
Stephen Hines
00871ab94a am c2c5cd09: Merge "Updated tests for simpler ScriptC constructors." into jb-mr1-dev 
* commit 'c2c5cd09ae50a800236b70c6b83df39c16fb20ca':
  Updated tests for simpler ScriptC constructors.
 2012-09-12 21:55:21 -07:00
Stephen Hines
c2c5cd09ae Merge "Updated tests for simpler ScriptC constructors." into jb-mr1-dev 2012-09-12 21:52:21 -07:00
Stephen Hines
58b2b24128 Updated tests for simpler ScriptC constructors. 
Change-Id: Ia1f66a3598a979924ccbf857093693135012c4c9
 2012-09-12 21:45:56 -07:00
Svetoslav Ganov
1b269a6d6f am 27d91832: Merge "Core accessibility settings should not be cleared on restore." into jb-mr1-dev 
* commit '27d91832235a061cf57a78643a4d34feda7c0070':
  Core accessibility settings should not be cleared on restore.
 2012-09-12 21:43:13 -07:00
Svetoslav Ganov
27d9183223 Merge "Core accessibility settings should not be cleared on restore." into jb-mr1-dev 2012-09-12 21:40:55 -07:00
Svetoslav Ganov
818d204590 Core accessibility settings should not be cleared on restore. 
1. The core accessibility settings required for a blind user to use
   the device should not be overwritten on restore. There could have
   been enabled via a global gesture from setup wizard, hence the
   user definitely needs them. Restoring disabled values for these
   settings render the device useless unless sighted help is sought.

bug:7138401

Change-Id: Idc593889aa61fada65b0407623720517c827df53
 2012-09-12 21:40:21 -07:00
Dianne Hackborn
6ba04590de am 3e451fa1: Merge "New permissions UI, again." into jb-mr1-dev 
* commit '3e451fa128e5b7beb22b413eb5600d6c980e5a29':
  New permissions UI, again.
 2012-09-12 21:39:06 -07:00
Dianne Hackborn
3e451fa128 Merge "New permissions UI, again." into jb-mr1-dev 2012-09-12 21:36:52 -07:00
Svetoslav Ganov
9e562fe8e4 am 1803e5e5: Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev 
* commit '1803e5e5c7bd867462c74c57c19b43422146d8f9':
  Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.
 2012-09-12 20:36:24 -07:00
Svetoslav Ganov
1803e5e5c7 Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev 2012-09-12 20:34:09 -07:00
Svetoslav Ganov
19f4a29fa4 Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service. 
1. This change enforces an accessibility service to require the system
   defined BIND_ACCESSIBILITY_SERVICE permission.

bug:6507771

Change-Id: If5e16bb4fa97891be0ccbb35e343773712e33b98
 2012-09-12 20:26:30 -07:00
Victoria Lease
a93e33e795 am e2052a33: Merge "Secure setting for LocationFudger\'s accuracy" into jb-mr1-dev 
* commit 'e2052a33f6db8db80714748e34a756320093e996':
  Secure setting for LocationFudger's accuracy
 2012-09-12 19:05:24 -07:00
Victoria Lease
e2052a33f6 Merge "Secure setting for LocationFudger's accuracy" into jb-mr1-dev 2012-09-12 19:03:04 -07:00
Dianne Hackborn
7454d3b73c New permissions UI, again. 
Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
 2012-09-12 18:57:07 -07:00
Winson Chung
2a4057d2e9 Updating IME tile with proper subtype name. 
Change-Id: Ie7fed20873f51e3b2b4def14532df00d71762418
 2012-09-12 18:30:53 -07:00
Winson Chung
16da6625cf am 2a4057d2: Updating IME tile with proper subtype name. 
* commit '2a4057d2e915a0726d8775a196374e320a9f15dc':
  Updating IME tile with proper subtype name.
 2012-09-12 18:30:49 -07:00
Amith Yamasani
d1f6889d81 am 5efc533b: Merge "Fix service binding for singleUser services" into jb-mr1-dev 
* commit '5efc533be6ac43df56a05c84972affbd07a913a7':
  Fix service binding for singleUser services
 2012-09-12 18:27:01 -07:00
Amith Yamasani
5efc533be6 Merge "Fix service binding for singleUser services" into jb-mr1-dev 2012-09-12 18:25:20 -07:00
Amith Yamasani
4076bc5046 Fix service binding for singleUser services 
Bug: 7137147

No need to try to retrieve the service again as user 0.

Change-Id: I910aca3fae91dc709ef2265ed0fce09f46f5b769
 2012-09-12 18:19:40 -07:00