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

110779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
1bab5064eb Merge "MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities" into klp-dev 2013-08-14 01:26:39 +00:00
Kenny Root
3fbaf5a6df am 5ad480c8: am 965eb258: am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '5ad480c8fba9a7044d827c38db235cffd52fbc13':
  Use hostname verifier directly instead of instance
 2013-08-13 18:26:06 -07:00
John Spurlock
3ef9a914e5 am 8b847dba: Merge "Delay transient navigation confirmation prompt." into klp-dev 
* commit '8b847dba09192dbc3a02d61cb99f71b68ce02291':
  Delay transient navigation confirmation prompt.
 2013-08-13 18:10:34 -07:00
John Spurlock
8b847dba09 Merge "Delay transient navigation confirmation prompt." into klp-dev 2013-08-14 01:05:38 +00:00
Kenny Root
5ad480c8fb am 965eb258: am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '965eb258438619774d37cce0ccf9edc976c7a343':
  Use hostname verifier directly instead of instance
 2013-08-13 17:59:31 -07:00
Kenny Root
965eb25843 am 1c2cb653: am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '1c2cb6533bfebf8b930850215e24327420e34a4b':
  Use hostname verifier directly instead of instance
 2013-08-13 17:57:10 -07:00
Kenny Root
1c2cb6533b am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '999ddae70360fc99e804d0b176af487582cd37c8':
  Use hostname verifier directly instead of instance
 2013-08-13 17:54:18 -07:00
Kenny Root
999ddae703 am ae24c0d5: am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'ae24c0d539414805a6c979f9318d0765506221ae':
  Use hostname verifier directly instead of instance
 2013-08-13 17:51:15 -07:00
Wink Saville
77267b3ed1 In isMobileOk don't execute finally if mobile data is not supported. 
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.

Bug: 10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
 2013-08-13 17:48:36 -07:00
Kenny Root
ae24c0d539 am bf15c7ce: am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'bf15c7cecefba8fdb3070c389a4966f11a8d8656':
  Use hostname verifier directly instead of instance
 2013-08-13 17:48:20 -07:00
Kenny Root
bf15c7cece am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
  Use hostname verifier directly instead of instance
 2013-08-13 17:44:27 -07:00
Kenny Root
dceda36b00 am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
  Use hostname verifier directly instead of instance
 2013-08-13 17:42:45 -07:00
Kenny Root
1c5e33d37d am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit '3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
  Use hostname verifier directly instead of instance
 2013-08-13 17:36:42 -07:00
John Spurlock
4cf6a948f9 Delay transient navigation confirmation prompt. 
Ensure the nav bar is hidden, then wait about the same amount
of time before showing the prompt.

Bug:10312565
Change-Id: Ifbbbc55edf2e40844296e3e96fcc5b491f1b246f
 2013-08-13 20:32:28 -04:00
Kenny Root
3bc3240ffb am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance 
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
  Use hostname verifier directly instead of instance
 2013-08-13 17:31:32 -07:00
Tom O'Neill
f083ae5859 am 95b2299d: Merge "API for location settings injection" into klp-dev 
* commit '95b2299dc476f4dbd50b8da8e0debff4b5ccba50':
  API for location settings injection
 2013-08-13 17:30:18 -07:00
Kenny Root
a6226a2d20 am 32c99004: Use hostname verifier directly instead of instance 
* commit '32c990044f027542a034a7606cf010dca6df252f':
  Use hostname verifier directly instead of instance
 2013-08-13 17:27:49 -07:00
Igor Murashkin
0bbe844284 am d48233e1: Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev 
* commit 'd48233e1e62c119b4bd67ad66e471f6a21e68a3d':
  camera2: Clear up docs for CameraDevice#configureOutputs
 2013-08-13 17:23:12 -07:00
Tom O'Neill
95b2299dc4 Merge "API for location settings injection" into klp-dev 2013-08-14 00:22:18 +00:00
Igor Murashkin
d48233e1e6 Merge "camera2: Clear up docs for CameraDevice#configureOutputs" into klp-dev 2013-08-14 00:16:42 +00:00
David Christie
72e6b98fec am 2163bb09: Merge "Don\'t allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn\'t be hidden." into klp-dev 
* commit '2163bb0924235dd3c3f47cbd8f25734cd8647ae9':
  Don't allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn't be hidden.
 2013-08-13 17:16:19 -07:00
David Christie
ee249601a0 am b5eaf266: Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don\'t mark an app as actively using location just because it\'s requested that provider. Also updates the concept of high power to support third party custom provid 
* commit 'b5eaf2662c174a7f5844bc62eba4f09dd64877f7':
  Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider.  Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement).
 2013-08-13 17:12:46 -07:00
David Christie
2163bb0924 Merge "Don't allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn't be hidden." into klp-dev 2013-08-14 00:10:36 +00:00
David Christie
b5eaf2662c Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider. Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement)." into klp-dev 2013-08-14 00:07:58 +00:00
destradaa
da67ea798e am 5c7e6460: Merge "Add support in the platform for Flp Geofencing." into klp-dev 
* commit '5c7e64609c4de93cd70c2cbe238a5fc3ff3c6078':
  Add support in the platform for Flp Geofencing.
 2013-08-13 17:02:35 -07:00
destradaa
5c7e64609c Merge "Add support in the platform for Flp Geofencing." into klp-dev 2013-08-13 23:56:31 +00:00
Robert Greenwalt
51ee814340 am 7a8d9d6f: Merge "Add support for batched wifi scans." into klp-dev 
* commit '7a8d9d6fecb31124ad1ec349944659a2f5672776':
  Add support for batched wifi scans.
 2013-08-13 16:28:34 -07:00
Robert Greenwalt
7a8d9d6fec Merge "Add support for batched wifi scans." into klp-dev 2013-08-13 23:22:52 +00:00
David Christie
ef20fd1ea0 Don't allow airplane mode to affect location status icon. 
Gps still operates when airplane mode is on, and consumes
just as much power so the icon shouldn't be hidden.

Change-Id: I10edc8771d3dd1831e94d26c6f61ca82d805cc12
 2013-08-13 16:14:10 -07:00
Wink Saville
ea25ea79df am ba5e533e: Merge "In isMobileOk don\'t execute finally if mobile data is not supported." into klp-dev 
* commit 'ba5e533eda951a7e97b4471db2be1954f6c21276':
  In isMobileOk don't execute finally if mobile data is not supported.
 2013-08-13 16:03:50 -07:00
David Christie
15b3191f91 Update location AppOp monitoring to respect settings. 
If a provider is disabled, we don't mark an app as
actively using location just because it's requested
that provider.  Also updates the concept of high
power to support third party custom providers
(doesn't hard code gps but looks at the provider's
actual stated power requirement).

Change-Id: Ie01243bf04d7301962ea9cdb25fb7d8d97566e02
 2013-08-13 16:01:36 -07:00
destradaa
0682809ad0 Add support in the platform for Flp Geofencing. 
Change-Id: I0fb0e276d3a06322697bb5d46323779aca1f78c5
 2013-08-13 16:00:04 -07:00
Wink Saville
ba5e533eda Merge "In isMobileOk don't execute finally if mobile data is not supported." into klp-dev 2013-08-13 22:57:54 +00:00
John Spurlock
bcadfea84e am f464511a: Merge "Sysui flag-related doc fixes." into klp-dev 
* commit 'f464511a7be2e381f508b5b2b937f19c98d800c2':
  Sysui flag-related doc fixes.
 2013-08-13 15:41:40 -07:00
Adam Skory
2ce5265e98 am 3890f854: Merge "Fix NPE in ActivityManagerService" into klp-dev 
* commit '3890f8543aefa1fba843b49d9482da2ac6a5bdc9':
  Fix NPE in ActivityManagerService
 2013-08-13 15:38:06 -07:00
John Spurlock
f464511a7b Merge "Sysui flag-related doc fixes." into klp-dev 2013-08-13 22:35:57 +00:00
Adam Skory
3890f8543a Merge "Fix NPE in ActivityManagerService" into klp-dev 2013-08-13 22:30:51 +00:00
Kenny Root
fb381053d5 Use hostname verifier directly instead of instance DO NOT MERGE 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
 2013-08-13 15:21:57 -07:00
Kenny Root
18e1524f5f am 87fefc44: am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE 
* commit '87fefc449bffabebf98020f40d21d28500b1c1bb':
  Use hostname verifier directly instead of instance DO NOT MERGE
 2013-08-13 14:54:13 -07:00
Scott Main
97daa7c0b2 am ab69476a: am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit 'ab69476a2be4a60ca73e1721cb46e956e87ec29a':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 14:54:10 -07:00
Kenny Root
87fefc449b am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE 
* commit '1adbf6b900a621675cd1928307bb88bb2c6501e5':
  Use hostname verifier directly instead of instance DO NOT MERGE
 2013-08-13 14:51:52 -07:00
Scott Main
ab69476a2b am 9b979448: am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit '9b979448581311f27456c1dcb9623a8d21bcf64f':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 14:51:31 -07:00
Tom O'Neill
fa2992c412 API for location settings injection 
- Partial fix for b/10287745

Change-Id: Ie998ce0a7b350e4183fce5753bfac3eb51238ff4
 2013-08-13 14:41:22 -07:00
Igor Murashkin
53f91c5c26 camera2: Clear up docs for CameraDevice#configureOutputs 
Change-Id: Id2397ca17c5968cb4dfdb337ea56be9d5f481669
 2013-08-13 14:37:42 -07:00
Robert Greenwalt
0451d59ba2 Add support for batched wifi scans. 
bug:9301872

Change-Id: I5a7edfdbd2b78a65119d11acad491eae350c0870
 2013-08-13 14:37:37 -07:00
John Spurlock
7facd7f6f1 Sysui flag-related doc fixes. 
Add new flags to existing flag listings, fix a broken @link, and
tweak wording.

Change-Id: Iebc4f5fc1c6fc3f8685c6252f88d8044fe08b79d
 2013-08-13 17:34:04 -04:00
Adam Skory
164c2edccd Fix NPE in ActivityManagerService 
Bug: 10294281
Change-Id: Iaf608ae099b90fac8ad726285652b5c3e74e1632
 2013-08-13 14:24:34 -07:00
Kenny Root
32c990044f Use hostname verifier directly instead of instance 
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
 2013-08-13 14:13:08 -07:00
Craig Mautner
34dd35b296 Fix Configuration layout direction comparison. 
If the Configuration layout direction is not changing don't indicate
that it has changed. When the indication is made incorrectly it
causes the window manager to believe that the configuration has
changed and it will start freezing the screen and setting up
animations. Bad jank is the result.

In Configuration.updateFrom() anytime that the screenLayouts were
different the code was setting ActivityInfo.CONFIG_LAYOUT_DIRECTION
in the return bitmask. Even if the only difference was between
UNDEFINED fields. This fix makes sure that the layout direction
field has actually changed before setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask.

In Configuration.diff() if the passed Configuration had
SCREENLAYOUT_LAYOUTDIR_UNDEFINED the code was setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask. This fix
makes sure that if the passed Configuration has fields set to
SCREENLAYOUT_*_UNDEFINED then corresponding bits will no longer be set
in the returned bitmask.

Fixes bug 10291622.
Fixes bug 10247094.

Change-Id: If26de662206fe85dc4671adbae39dfb99dc1038c
 2013-08-13 13:29:18 -07:00
Fabrice Di Meglio
1c97c50cc7 am 63113994: Merge "Code cleaning for Drawables" into klp-dev 
* commit '63113994034e2e71bac40d2de076fa9b1b406960':
  Code cleaning for Drawables
 2013-08-13 13:17:38 -07:00