42100 Commits

Author SHA1 Message Date
Christopher Tate
a3664247c7 New API: apps can request a wipe of their own data
Bug 9588299

Change-Id: I817a90e272ba279d7171f6dbe88dbafd7e42b050
2013-06-27 15:32:37 -07:00
Kenny Root
b3933b979d am 67f7d8fb: am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '67f7d8fbd5ad84681fbdfea184ce538c6834896a':
  Add ALPN support to SSL socket factory
2013-06-27 14:57:46 -07:00
Yorke Lee
a2c8cbdd95 am 11b249f6: am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit '11b249f641163eefbe7ec8582107c4ed5726baea':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:57:43 -07:00
Romain Guy
db4ae2b10e am dbfb2ab4: am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit 'dbfb2ab4a760f0da910758467a7b9fccf09e97f5':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:57:40 -07:00
Kenny Root
67f7d8fbd5 am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '6c042b6d678edea0f936da994f85ba62f9a1950e':
  Add ALPN support to SSL socket factory
2013-06-27 14:55:41 -07:00
Yorke Lee
11b249f641 am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:52:37 -07:00
Romain Guy
dbfb2ab4a7 am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit '93d46952db60090ae22bc8197659a06ae23cb58b':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:52:33 -07:00
Kenny Root
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
2013-06-27 14:52:17 -07:00
Yorke Lee
e6cb43a1ea Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev 2013-06-27 21:46:19 +00:00
Alan Viverette
673e64dd62 Merge "Optimize width measurement and cache result in MenuPopupHelper" 2013-06-27 21:38:52 +00:00
Alan Viverette
62339911ba Merge "Update ListMenuItemView to use a single RelativeLayout" 2013-06-27 21:38:31 +00:00
Kenny Root
a5a2de5508 Merge "Add ALPN support to SSL socket factory" 2013-06-27 21:25:24 +00:00
Craig Mautner
5729b81ab5 Merge "Add API to convert translucent Activity to opaque." 2013-06-27 21:00:44 +00:00
Craig Mautner
8cbafbe6d2 Merge "Add debug for specific bug." 2013-06-27 19:29:05 +00:00
Craig Mautner
e7c58b6d7d Add debug for specific bug.
To be removed once the bug is fixed.

Change-Id: Ie273d4503bb0b534af0e9efe8f45c573766e9a74
2013-06-27 11:52:04 -07:00
Dianne Hackborn
9b43a60405 Merge "Work on issue #9586838: Crash after waking up Hammerhead device" 2013-06-27 18:07:24 +00:00
Romain Guy
67603c6e1b Recreate TextureView's display list on attach
Bug #9425270

When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.

The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.

Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
2013-06-27 10:58:10 -07:00
Oliver Woodman
86bebb4c78 Merge "Expose latency methods through AudioManager and AudioTrack." 2013-06-27 10:40:08 +00:00
Dianne Hackborn
053f61d6a6 Work on issue #9586838: Crash after waking up Hammerhead device
I made the power manager more rigid, not allowing different uids
to use the same wake lock.  This never should happen.  I would
guess there is somewhere that the activity manager is acquiring
the wake lock without clearing the calling identity...  but it is
hard to follow all the paths this may happen in.  So here we add
some checks when acquiring/releasing the wake lock to make sure
it is being done as the system uid.

Also:

- Protect the new activity stack calls with a permission, and
make sure to clear the calling uid once past that.
- Collect uid data from process stats so we can correctly
associate CPU use with a uid even if we don't know about the
pid for some reason.
- Fix battery stats dump commands to clear calling uid before
executing so they aren't broken.

Change-Id: I0030d4f7b614e3270d794ecfc3669139a5703ce9
2013-06-26 19:17:15 -07:00
Alan Viverette
0bce6ab8cd Optimize width measurement and cache result in MenuPopupHelper
BUG: 9591217
Change-Id: I0cc2fad39f967e92b2c954f6417430a42dce8e43
2013-06-26 17:46:16 -07:00
Alan Viverette
8933efd49a Update ListMenuItemView to use a single RelativeLayout
BUG: 9591217
Change-Id: If5d301f70ac3806ab14e309affa57c625d897c7d
2013-06-26 17:38:17 -07:00
Romain Guy
9feab843ac Merge "Refcount 9-patches and properly handle GC events" 2013-06-27 00:16:18 +00:00
Romain Guy
e3b0a0117a Refcount 9-patches and properly handle GC events
This change adds refcounting of Res_png_9patch instances, the native
data structure used to represent 9-patches. The Dalvik NinePatch class
now holds a native pointer instead of a Dalvik byte[]. This pointer
is used whenever we need to draw the 9-patch (software or hardware.)

Since we are now tracking garbage collection of NinePatch objects
libhwui's PatchCache must keep a list of free blocks in the VBO
used to store the meshes.

This change also removes unnecessary instances tracking from
GLES20DisplayList. Bitmaps and 9-patches are refcounted at the
native level and do not need to be tracked by the Dalvik layer.

Change-Id: Ib8682d573a538aaf1945f8ec5a9bd5da5d16f74b
2013-06-26 17:15:08 -07:00
William Luh
7337fb4608 Merge "Add Exploit Detection User Consent to Settings." 2013-06-27 00:01:39 +00:00
William Luh
623a42824c Add Exploit Detection User Consent to Settings.
Change-Id: I7f6bcaac4730c002a3531ed5f5926e56f86f8ee3
2013-06-26 16:28:15 -07:00
Dianne Hackborn
49e9c44c4b Merge "Add new ActivityManager.isLowRamDevice()." 2013-06-26 23:16:48 +00:00
Amith Yamasani
5fa9f2b127 Merge "Single-user restrictions" 2013-06-26 23:04:32 +00:00
Dianne Hackborn
b4e1249493 Add new ActivityManager.isLowRamDevice().
This and the old isHighEndGfx() is set up through a
device configuration, rather than trying to compute it
automatically.

Change-Id: Ibc95c05791023a7ae6c88555b75bb61f2b613991
2013-06-26 15:50:02 -07:00
Alan Viverette
57b867f3f5 Merge "Minor ListView clean up. Exposes View.pointInView() as hidden API." 2013-06-26 22:12:28 +00:00
Georgi Nikolov
e738c13d11 Merge "Bugfix 9373708 JBMR2 runtime restart (system process crash in the sync manager) during setup" 2013-06-26 22:11:32 +00:00
Dianne Hackborn
49a31e0d67 Merge "Update procstats to start collecting/reporting pss." 2013-06-26 21:11:49 +00:00
Igor Murashkin
70725500dc Initial camera device implementation
* Working streaming preview requests only
* Almost everything else returns empty objects that don't do anything

Bug: 9213377
Change-Id: Ie6f02a7c0952b0f5ebc41905425b15cae221f7d3
2013-06-26 13:19:45 -07:00
Igor Murashkin
e363fbb264 Partial CameraManager implementation
Bug: 9213377
Change-Id: I8f89fb94d7081a71b38e5cd0ad89116d219b4c33
2013-06-26 13:19:44 -07:00
Georgi Nikolov
dbe846b02e Bugfix 9373708
JBMR2 runtime restart (system process crash in the sync manager) during setup

The fix is to ensure that all access to SyncStatusInfo and related objects happens
while holding the mAuthority lock or is on a per-thread copy of the objects

Also, includes an unrelated fix for a bug I just noticed in the way
dumpSyncState() prints the periodic sync info

Change-Id: Id9e4dff41029412e133bdabc843d555434d9a12f
(cherry picked from commit 182ff3acbad9850b40d37ad1c23106be6eda8476)
2013-06-26 20:16:05 +00:00
Robert Greenwalt
505e35bca9 am c869696e: am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
* commit 'c869696ef3c1dca3efbc6ce8ab804e8a1b117900':
  Fix power issues around wifi scans.
2013-06-26 11:54:55 -07:00
Dianne Hackborn
13ac041b9f Update procstats to start collecting/reporting pss.
Completely reworked how it manages its data, since trying
to keep track of all of the possible pss data with the old
data structures would have made it huge.  Now we have a sparse
data structure for pss and process times.  (Will switch service
times over to it soon.)

Currently the only thing that collects pss data is running
"dumpsys meminfo".  More will be added later.

Modified checkin output to also scale better as more distinct
data categories are added, and added output of pss data.  Now
instead of dumping every possible entry as a comma-separated
list, it dumps a comma-separated list of only the entries with
data, tagged with the state they go with.

Also fixed some problems in the checkin reporting of batterystats
(it needs to escape commas), added checkin reporting of the history
list, fixed parsing of kernel wake locks to strip quotes, fixed
wake lock name that the sync manager generates to be more sane.

Change-Id: Ibf4010838a9f685ebe1d93aff86c064ccc52b861
2013-06-26 11:45:36 -07:00
Robert Greenwalt
c869696ef3 am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
* commit '65f7a95fc4c06127e7372bcb0d14e561cc23dd80':
  Fix power issues around wifi scans.
2013-06-26 10:55:00 -07:00
Kenny Root
100d729026 Add ALPN support to SSL socket factory
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
2013-06-26 10:35:39 -07:00
Robert Greenwalt
8971084258 Fix power issues around wifi scans.
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-26 10:00:16 -07:00
Oliver Woodman
61dcdf3764 Expose latency methods through AudioManager and AudioTrack.
There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
2013-06-26 16:33:54 +01:00
Alan Viverette
0fb018403b Merge "Fix FastScroller for single-section lists and untitled sections." 2013-06-26 00:56:39 +00:00
Alan Viverette
3d15a2b8f4 Minor ListView clean up. Exposes View.pointInView() as hidden API.
Change-Id: Ia628f8438fac5af2471efd8558c8876fae3dafb0
2013-06-25 17:27:37 -07:00
John Reck
ced29a54b6 am 52dbdbf2: am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '52dbdbf2d10f4e53f76c40a0bed0ffe31301f1f0':
  Fix deadlock of WebViewCoreThread
2013-06-25 17:02:08 -07:00
Craig Mautner
4addfc5f39 Add API to convert translucent Activity to opaque.
Fixes bug 9298778.

Change-Id: If6198f42bdea8aa727a2abc672eb0062aaf63ca3
2013-06-25 16:56:37 -07:00
Alan Viverette
6b40cc7f8a Fix FastScroller for single-section lists and untitled sections.
Change-Id: I121d9427e87e1a9e09562642f6aa621fc1cc849a
2013-06-25 16:41:52 -07:00
Amith Yamasani
655d0e2029 Single-user restrictions
Introduces a new "blocked" state for each package. This is used to temporarily
disable an app via Settings->Restrictions.

PIN creation and challenge activities for use by Settings and other apps. PIN
is stored by the User Manager and it manages the interval for retry attempts
across reboots.

Change-Id: I4915329d1f72399bbcaf93a9ca9c0d2e69d098dd
2013-06-25 16:03:55 -07:00
John Reck
52dbdbf2d1 am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
  Fix deadlock of WebViewCoreThread
2013-06-25 15:34:16 -07:00
John Reck
9d2b0dbf67 am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
  Fix deadlock of WebViewCoreThread
2013-06-25 15:31:39 -07:00
John Reck
12c4c0e45b Merge "Fix deadlock of WebViewCoreThread" 2013-06-25 22:28:02 +00:00
Baligh Uddin
9738a2d834 Merge "Import translations. DO NOT MERGE" 2013-06-25 19:30:22 +00:00