Romain Guy
9b5a1a28c3
Take shadow bounds into account for quick rejects
...
Bug #8634346
Change-Id: I995c5205c2959d8e4da638ae47fedcda92eb1b36
2013-08-09 14:06:29 -07:00
Dianne Hackborn
d81a15c6b7
Merge "Add method for adding two ProcessStats objects together." into klp-dev
2013-08-09 19:10:38 +00:00
Dianne Hackborn
60444fd594
Add method for adding two ProcessStats objects together.
...
Also move file reading code over to ProcessStats.
Change-Id: Ib42272b90a408a494044965e98beed16c0b3f8a5
2013-08-09 12:08:17 -07:00
Fabrice Di Meglio
5af4edef08
Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
2013-08-09 18:11:33 +00:00
Mathias Agopian
5893a97cbf
Merge "fix-up dependencies to gl headers" into klp-dev
2013-08-09 04:39:55 +00:00
Mathias Agopian
e3eae73abb
fix-up dependencies to gl headers
...
Change-Id: I9f176847587db1f9ccee2bc425106d277ffceee6
2013-08-08 21:09:16 -07:00
Romain Guy
003123004f
Remove an unnecessary allocation
...
Also remove dead code from OpenGLRenderer.cpp
Change-Id: I7eb54ca19e77ee3c32f1fe9513a031e6b2e115cf
(cherry picked from commit 5c7d5ab878b26f855175a3305a14ac12fcacf25e)
2013-08-09 03:52:29 +00:00
Fabrice Di Meglio
41207bce2a
Fix bug #10205316 CTS (KLP): android.graphics tests are failing
...
- fix null Shader case during copy
Related to https://googleplex-android-review.googlesource.com/#/c/336815/7
Change-Id: I920d6bb181ddb92d6f771e5060fd1858430e71ad
2013-08-08 19:11:34 -07:00
Jeff Sharkey
37ee68fc09
Merge "Always include a default DocumentStack." into klp-dev
2013-08-09 00:59:02 +00:00
Jeff Sharkey
255b4a6fdb
Always include a default DocumentStack.
...
Change-Id: Idbde1d832ac95c4b3c8bd5cd82b0fa695e0bcb6d
2013-08-08 17:57:16 -07:00
Svetoslav
d3964489f1
Merge "Some hygiene for the touch explorer." into klp-dev
2013-08-09 00:52:51 +00:00
Jeff Sharkey
8a65f5b871
Merge "Allow packages.list access with new GID." into klp-dev
2013-08-09 00:44:55 +00:00
Svetoslav
84044b3ce7
Some hygiene for the touch explorer.
...
1. Removed the inactive pointer filtering which was not reporting pointers
to the apps if they did not travel a minimal distance. This prohibits
developemnt of apps with innovative interaction models such as using
the screen as a virtual Braille keyboard.
2. We need the first pointer to travel some distance or a minimal amount of
time to pass before deciding if the user explores or performs a gesture.
In this period we were dropping events which was preventing inovative
interfaces such as gesture based typing since we were chopping off a
significant portion of the data.
Change-Id: I5c1aa98d14c83f356a9c59c93f4dc1f970c0faca
2013-08-08 17:44:46 -07:00
Jeff Sharkey
184a0100ab
Allow packages.list access with new GID.
...
The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.
Also switches FileUtils to use Libcore.os.
Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
2013-08-08 17:38:13 -07:00
Jonathan Dixon
427733280b
Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
2013-08-09 00:36:03 +00:00
Jonathan Dixon
667fe1039f
Refactor Canvas.drawPicture() to delegate to Picture
...
Bug: 9814370
To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.
Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
2013-08-08 17:22:48 -07:00
Wink Saville
89d16f7597
am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
If in a mobile captive portal is detected enable fail fast.
2013-08-08 17:10:34 -07:00
Wink Saville
292a92e337
am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
...
* commit '7c00be48fcb1986db14915beef549e925b5670d2':
Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 17:10:32 -07:00
Wink Saville
f5f75cd8f2
Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev
2013-08-09 00:09:25 +00:00
Wink Saville
f35f3201db
Merge commit '81132d51' into fix-merge-conflict
...
* commit '81132d51':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5
2013-08-08 16:51:46 -07:00
Jeff Brown
0933570357
Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
2013-08-08 23:30:31 +00:00
Wink Saville
280f6218a5
am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
...
* commit '81b1fa6fc62190d64a6b76b4a5ee7cc2bf3172ac':
Check that hipri has started.
2013-08-08 16:22:14 -07:00
Joe Malin
5f055ea109
am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
...
* commit 'bc8bb009ae7144a81c66aeed985a929dbc4778e7':
Doc Change: Fix 10224981 error in code snippet
2013-08-08 16:21:55 -07:00
Dianne Hackborn
53b9065acf
am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007 : Reset apps restores most of the changed settings...
...
* commit '42380b6de656ca1336b8b99dbc7995cfbf875924':
Fix issue #10226007 : Reset apps restores most of the changed settings...
2013-08-08 16:21:19 -07:00
destradaa
541ba71073
Merge "Add FlpHal layer to support Location Batching." into klp-dev
2013-08-08 22:57:25 +00:00
Wink Saville
9b7b445018
am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '02eab434ad9faa25291e63023b7e66698ca457a8':
If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:46:55 -07:00
Wink Saville
7c00be48fc
am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
...
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:46:52 -07:00
Wink Saville
81132d5197
am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
...
* commit 'b9b4321b756ac6e44650031ebfe0134508f60eaa':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-08 15:46:49 -07:00
Wink Saville
81b1fa6fc6
am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
...
* commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
Check that hipri has started.
2013-08-08 15:46:46 -07:00
Jesse Hall
6a6bc216d1
Use new ISurfaceComposer::destroyDisplay method
...
Bug: 10191053
Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
2013-08-08 15:44:15 -07:00
Wink Saville
02eab434ad
am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:43:24 -07:00
Wink Saville
55adb390bb
am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
...
* commit '35152f13b3302dbcb43345458dd5b8b092e37320':
Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:43:13 -07:00
Wink Saville
b9b4321b75
am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
...
* commit '5191b8599011c255936e3a3cacc052c03e57b772':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
2013-08-08 15:43:07 -07:00
Wink Saville
9b6363e5e6
am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
...
* commit 'cbad1243ad901b8ffcb7497a8f440414b8d41898':
Check that hipri has started.
2013-08-08 15:43:00 -07:00
destradaa
1af4b0280a
Add FlpHal layer to support Location Batching.
...
Change-Id: Ia3a57d869dfb3f067a1b95fa66d54f311ddcfdc3
2013-08-08 15:27:38 -07:00
Wink Saville
4d87d91dfe
Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
2013-08-08 22:06:21 +00:00
Wink Saville
5191b85990
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
2013-08-08 22:05:20 +00:00
Wink Saville
cbad1243ad
Merge "Check that hipri has started." into jb-mr2-dev
2013-08-08 22:03:45 +00:00
Dianne Hackborn
8a0de58ece
Get ProcessStats callable from other processes.
...
Also fix a bug where, when parceling the stats, we were
computing the final duration values too late. We need to
do that before we write the long table.
Change-Id: Idb6c1ed95417448c56973fe5866bfb3570e525f4
2013-08-08 15:00:18 -07:00
David Christie
8ffe17ae32
Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev
2013-08-08 21:41:04 +00:00
Vinit Deshapnde
ce65961d4d
Merge "Use a single socket to communicate with supplicant" into klp-dev
2013-08-08 21:23:50 +00:00
Joe Malin
58930af048
am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
...
* commit '68091b9e108336af21ff1248aac960e9544668af':
DOC CHANGE: Fixed bug 10210178
2013-08-08 14:14:23 -07:00
The Android Open Source Project
350b9b9bf1
am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '9d42e438cb86a398bd1f9255a7ede35e8c455139':
Add new app ops method to reset all op modes.
Add new app ops method to reset all op modes.
Revert "Add version identifier to app ops."
Add version identifier to app ops.
Allow the user to block notifications for foreground services.
(DO NOT MERGE) Fix pub issue #58043 : Copy crash in Android 4.3...
2013-08-08 14:14:15 -07:00
Marco Nelissen
84135337d1
am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
...
* commit '53d86f6e495e3f950191419645e34970779a3fea':
When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
2013-08-08 14:14:10 -07:00
Marco Nelissen
d6aa247155
am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
...
* commit 'ca4553d33fe779dcdf2daad4590e4dbcfec7b62f':
Guarantee that all db related files are deleted together.
2013-08-08 14:14:06 -07:00
David Christie
c750c1fb83
Update gps status icon to be a "high power" location icon.
...
Move icon to right side of the screen and synchronize status with
AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION.
Change-Id: Iea2570501cb18be0489669fd4ea240dc63f9567a
2013-08-08 14:06:25 -07:00
Amith Yamasani
672d323bb4
Merge "Developer option to force RTL layout" into klp-dev
2013-08-08 20:45:47 +00:00
Amith Yamasani
d8415f4bf0
Developer option to force RTL layout
...
Make sure screen layout changes are taken into account in Configuration diffs.
Initialize the SystemProperty from Global settings on startup of
ActivityManagerService.
TextUtils checks the override flag to decide if the default layout direction
should be forced to RTL.
Bug: 10244047
Change-Id: I23a2583d790a355060d0d898ba44e5f7dc896b46
2013-08-08 13:42:02 -07:00
David Christie
4104d32952
Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don't have to find all the different parts of the code that use it (location settings, location quick settings, power widget, etc)." into klp-dev
2013-08-08 19:43:17 +00:00