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

112249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
ca34af6ad3 am e2acbcc0: Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c\'tor" into klp-dev 
* commit 'e2acbcc0053eb9aac4ac17e1f0e8615556003da8':
  Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
 2013-08-30 02:06:28 -07:00
Ben Murdoch
e2acbcc005 Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c'tor" into klp-dev 2013-08-30 09:03:59 +00:00
Brian Carlstrom
22af3efbb3 am 61dbdaba: am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '61dbdabaf71bd7b9eb25b587b1faeb10fd1da527':
  Make MeasuredText.sCached field final
 2013-08-29 22:09:16 -07:00
Brian Carlstrom
61dbdabaf7 am 98c9491f: am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '98c9491f4d0854c4ba2de2071dee2548d572e6d0':
  Make MeasuredText.sCached field final
 2013-08-29 22:06:57 -07:00
Brian Carlstrom
98c9491f4d am 39e885dc: Merge "Make MeasuredText.sCached field final" 
* commit '39e885dc821fbfade43423fae712f82b1df08467':
  Make MeasuredText.sCached field final
 2013-08-29 22:04:18 -07:00
Brian Carlstrom
39e885dc82 Merge "Make MeasuredText.sCached field final" 2013-08-30 05:01:55 +00:00
Wink Saville
90c7480168 am 16811725: am e8fcfd53: Merge "Add debug and remove SocketTimeoutException." into klp-dev 
* commit '1681172544af7b43f7048ee703a26d127d5bc7aa':
  Add debug and remove SocketTimeoutException.
 2013-08-29 20:36:34 -07:00
Wink Saville
1681172544 am e8fcfd53: Merge "Add debug and remove SocketTimeoutException." into klp-dev 
* commit 'e8fcfd53f60229f7f920992145bacb45a0a55675':
  Add debug and remove SocketTimeoutException.
 2013-08-29 20:33:49 -07:00
Wink Saville
e8fcfd53f6 Merge "Add debug and remove SocketTimeoutException." into klp-dev 2013-08-30 03:30:51 +00:00
Jim Miller
130016b9c6 am 53be76e1: am 0d72b3e0: Merge "Disable hotword detection on low-memory devices" into klp-dev 
* commit '53be76e17205174d3808ba608eece15d2c0d6637':
  Disable hotword detection on low-memory devices
 2013-08-29 19:15:46 -07:00
Jim Miller
53be76e172 am 0d72b3e0: Merge "Disable hotword detection on low-memory devices" into klp-dev 
* commit '0d72b3e052e6289936286af6506bfd9fa8f7646b':
  Disable hotword detection on low-memory devices
 2013-08-29 19:13:41 -07:00
Jim Miller
0d72b3e052 Merge "Disable hotword detection on low-memory devices" into klp-dev 2013-08-30 02:12:27 +00:00
Jim Miller
d54281061c Disable hotword detection on low-memory devices 
Change-Id: If21f852af36a8f6dea17f3a87b22f39db3d1d6e8
 2013-08-29 18:58:21 -07:00
Fabrice Di Meglio
253fb7f6c3 Fix bug #10549094 KLP API Review: android.util.LayoutDirection 
- use constant class instead of an interface
- make it final

Change-Id: I1bde76eb84cd92427e4e1fc2483cdecec429ae99
 2013-08-29 18:13:28 -07:00
John Spurlock
28a71a5c7f am f5fbef73: am 8f1f0109: Remove unused status bar help and obsolete resources. 
* commit 'f5fbef7357734013346f745bff578b66e0a94fc0':
  Remove unused status bar help and obsolete resources.
 2013-08-29 18:13:08 -07:00
John Spurlock
f5fbef7357 am 8f1f0109: Remove unused status bar help and obsolete resources. 
* commit '8f1f0109d3c124bfcb09c99e69e6ad51b8208c24':
  Remove unused status bar help and obsolete resources.
 2013-08-29 18:10:27 -07:00
John Spurlock
8f1f0109d3 Remove unused status bar help and obsolete resources. 
Bug:10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
 2013-08-29 21:02:15 -04:00
Matthew Williams
141831761b am f419ff06: am fda4698c: Merge "Turn off debugging in SyncManager" into klp-dev 
* commit 'f419ff06a72f5e72bcf413b3add8e2069f2541cf':
  Turn off debugging in SyncManager
 2013-08-29 17:29:00 -07:00
Matthew Williams
f419ff06a7 am fda4698c: Merge "Turn off debugging in SyncManager" into klp-dev 
* commit 'fda4698c255075d7f0209834b364dfe344e3ee75':
  Turn off debugging in SyncManager
 2013-08-29 17:26:48 -07:00
Matthew Williams
fda4698c25 Merge "Turn off debugging in SyncManager" into klp-dev 2013-08-30 00:24:11 +00:00
Jason Sams
c850221500 am a2c13b3a: am c2b582c0: Merge "Cleanup API typo" into klp-dev 
* commit 'a2c13b3a08b4b5a8f340cdedfd56557699dcb177':
  Cleanup API typo
 2013-08-29 17:08:11 -07:00
Jason Sams
a2c13b3a08 am c2b582c0: Merge "Cleanup API typo" into klp-dev 
* commit 'c2b582c0b63df855a7492db3fb00dd194bf86fe3':
  Cleanup API typo
 2013-08-29 17:06:07 -07:00
Jason Sams
c2b582c0b6 Merge "Cleanup API typo" into klp-dev 2013-08-30 00:03:36 +00:00
Jason Sams
a49e89d228 Cleanup API typo 
bug 10548782

Change-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0
 2013-08-29 17:00:37 -07:00
Zhentao Sun
d535ead295 Fixed b/10512887. 
This is an issue caused by multi-threading. If geofence provider service
is connected and disconnected immediately, the ServiceWatcher can return a
null service handle to the private thread used by GeofenceProxy, and
this can cause NPE and system crash.
This CL also fixed a hidden race conditions bug where mGeofenceHardware
is not synchronized between two threads.

Change-Id: I824642cd638fbb1e6799a5a1220b047ebc2556a1
 2013-08-29 16:56:19 -07:00
Wink Saville
9d4204d625 Add debug and remove SocketTimeoutException. 
Bad merge from jb-mr2 to klp, the SocketTimeoutException
in isCaptivePortal should not be present. Also add debug
for bug 9972012. The SocketTimeoutException is a possible
cause of 9972012 but the logs from post #24 it was not
caused by a timeout, so this is not a fix.

Bug: 9972012
Change-Id: I290518832f8258d4682821815834f5621245b643
 2013-08-29 16:42:44 -07:00
Robert Greenwalt
8e606a400e am 099845f1: am 1c7674ef: Merge "Don\'t show roaming icon for specific operators" into klp-dev 
* commit '099845f1ae14c80a16b166ea72ed6fa72ee39879':
  Don't show roaming icon for specific operators
 2013-08-29 16:25:23 -07:00
Robert Greenwalt
099845f1ae am 1c7674ef: Merge "Don\'t show roaming icon for specific operators" into klp-dev 
* commit '1c7674ef55d283bf253973a6c6b738423f2e0a05':
  Don't show roaming icon for specific operators
 2013-08-29 16:22:22 -07:00
Robert Greenwalt
1c7674ef55 Merge "Don't show roaming icon for specific operators" into klp-dev 2013-08-29 23:17:50 +00:00
Svetoslav Ganov
4b905b6195 am 97c61ab7: am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev 
* commit '97c61ab7c02c24c485acf5775310a304730dfeea':
  Print spooler security and some new print service facing APIs.
 2013-08-29 16:05:09 -07:00
Svetoslav Ganov
97c61ab7c0 am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev 
* commit '86d2db9750657401deadea6766c94300c3bfc7cd':
  Print spooler security and some new print service facing APIs.
 2013-08-29 16:02:22 -07:00
Svetoslav Ganov
86d2db9750 Merge "Print spooler security and some new print service facing APIs." into klp-dev 2013-08-29 22:59:08 +00:00
Adam Powell
bdb284c516 am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev 
* commit '91fa056a58fdad8f8e6e8a76a902c2a566364f29':
  GridLayout changes for API council
 2013-08-29 15:43:04 -07:00
Adam Powell
91fa056a58 am 27439903: Merge "GridLayout changes for API council" into klp-dev 
* commit '27439903438abfb24f5c36151386e723f2e57ebc':
  GridLayout changes for API council
 2013-08-29 15:41:23 -07:00
Svetoslav Ganov
d26d4898fc Print spooler security and some new print service facing APIs. 
1. Updated the security mode of the print spooler. Now the spooler
   is not signed with the system key, it is not a privileged app so if
   it gets compromised (PDF rendering is a potential attack vector)
   it cannot access dangerous permissions. Also only the system
   can bind to the spooler.

2. Added APIs for asking a print service to start and stop tracking
   a given printer. This is need for the case when the user selects
   the printer and the print service should do a best effort to keep
   the system updated for the current state of the printer.

3. Added APIs for putting a print job in a blocked state. A print
   service would report the print job as blocked if for some reason
   the printer cannot proceed, e.g. 99 pages are printed but there
   is no paper for the last one. The user has to add more paper
   and the print service can resume the job.

4. Changed the read/write APIs to use ParcelFileDescriptor instead
   of FileDescriptor since the latter does not have a clean API for
   detaching the wrapped Linux file descriptor when one wants to
   push it to native.

5. Added API for getting the size of the printed document so the
   print service can avoid handling big filed over cellular network
   or ask the user if needed.

6. Now the print services that are preinstalled on the system image
   are automatically enabled.

Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
 2013-08-29 15:39:44 -07:00
Adam Powell
2743990343 Merge "GridLayout changes for API council" into klp-dev 2013-08-29 22:38:24 +00:00
Matthew Williams
28b1fc6422 Turn off debugging in SyncManager 
Bug: 10549076
Change-Id: I63ad8af5fbe8736eb7ca8307a4beef5310a1c10c
 2013-08-29 22:30:43 +00:00
Kenny Root
90300f828c am b43b5618: am 9c83b968: am 85b666c3: Merge "Use core-tests-support instead of core-tests" 
* commit 'b43b561884beb7a8bf9e692aa9f31d7dabf89452':
  Use core-tests-support instead of core-tests
 2013-08-29 15:27:19 -07:00
Kenny Root
b43b561884 am 9c83b968: am 85b666c3: Merge "Use core-tests-support instead of core-tests" 
* commit '9c83b96859a67080101823c91ef7617c3b12354e':
  Use core-tests-support instead of core-tests
 2013-08-29 15:24:57 -07:00
quddusc
3a06fe85cc am 7c3b84a3: am 93c84e82: am ee9d38ff: am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
* commit '7c3b84a3ff6c1f89fc724581cbdcda29ff06e43e':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
 2013-08-29 15:20:13 -07:00
quddusc
7c3b84a3ff am 93c84e82: am ee9d38ff: am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
* commit '93c84e8242fed75f838b53beea2b3116c4d3276a':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
 2013-08-29 15:17:46 -07:00
Wink Saville
ae1fda5aa3 am d2f41b3d: am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev 
* commit 'd2f41b3dc692e2c9a0c2f60bdf0730d9b52b6df3':
  Add support for handling mobile provisioning networks.
 2013-08-29 15:16:27 -07:00
quddusc
93c84e8242 am ee9d38ff: am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
* commit 'ee9d38ff24358774d194108128e99f09d08ddf8e':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
 2013-08-29 15:16:01 -07:00
Wink Saville
d2f41b3dc6 am 35bd30b1: Merge "Merge commit \'270226b0\' into manualmerge" into klp-dev 
* commit '35bd30b184b321754697b992aa5c581e204d530a':
  Add support for handling mobile provisioning networks.
 2013-08-29 15:14:02 -07:00
Wink Saville
35bd30b184 Merge "Merge commit '270226b0' into manualmerge" into klp-dev 2013-08-29 22:10:52 +00:00
Adam Powell
465ea74234 GridLayout changes for API council 
* Hide set/getPrinter methods. A change/addition like this should
  happen for all views if it happens, not just for one specific view.

* Follow Android style guidelines for fields.

Bug 10549037

Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit 916159461bf17e13c245a709935a0d1133e0ed91)
 2013-08-29 21:59:22 +00:00
Wink Saville
7788c61af5 Merge commit '270226b0' into manualmerge 
* commit '270226b0':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
 2013-08-29 14:57:08 -07:00
Amith Yamasani
4014239337 am b14f82be: am 79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev 
* commit 'b14f82be509da4698c6aeb4bb3d1e483f85375af':
  Improve Intent disambig dialog behavior
 2013-08-29 14:56:03 -07:00
Kenny Root
9c83b96859 am 85b666c3: Merge "Use core-tests-support instead of core-tests" 
* commit '85b666c3b61fd9a64731b144f00abe91e19cfe54':
  Use core-tests-support instead of core-tests
 2013-08-29 14:52:34 -07:00
Kenny Root
85b666c3b6 Merge "Use core-tests-support instead of core-tests" 2013-08-29 21:49:32 +00:00