Andres Morales
b4e67822ea
am b6152aba: am 5d623881: am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import
...
* commit 'b6152abafff0b6f194f00da93dca2d42f4002786':
Fix build, previous commit failed to remove an import
2014-10-07 20:34:41 +00:00
Andres Morales
81f06a6dce
am 1603e30e: am 6ef845d3: am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
...
* commit '1603e30e7f99b7b02d580ad639e1e316add0d33e':
Remove dead NFC unlock code from fw/base
2014-10-07 20:34:36 +00:00
Andres Morales
5d62388192
am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import
...
* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
Fix build, previous commit failed to remove an import
2014-10-07 20:03:14 +00:00
Andres Morales
6ef845d34a
am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
...
* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
Remove dead NFC unlock code from fw/base
2014-10-07 20:03:09 +00:00
Andres Morales
4e55835541
am 258d2221: Fix build, previous commit failed to remove an import
...
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
Fix build, previous commit failed to remove an import
2014-10-07 19:58:41 +00:00
Andres Morales
b4589115ad
am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
...
* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
Remove dead NFC unlock code from fw/base
2014-10-07 19:58:36 +00:00
Andres Morales
258d222152
Fix build, previous commit failed to remove an import
...
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309
Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
2014-10-07 18:11:21 +00:00
Amith Yamasani
34a2a6ca93
am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
...
* commit '42f611f2f5cbc68a6aaac18ed9e3c62ebc765901':
Set the default user restrictions to disallow calling and sms
2014-10-07 18:02:29 +00:00
Amith Yamasani
4797554ab8
am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
...
* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
Set the default user restrictions to disallow calling and sms
2014-10-07 17:43:08 +00:00
Amith Yamasani
b86671f4b8
am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
...
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
Set the default user restrictions to disallow calling and sms
2014-10-07 17:33:25 +00:00
Amith Yamasani
41bb3455e4
Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
2014-10-07 17:11:34 +00:00
Amith Yamasani
aa6634eaca
Set the default user restrictions to disallow calling and sms
...
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.
Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
2014-10-06 18:24:32 -07:00
Jeff Sharkey
0cfe6f1d2f
am 6d3ea645: am fcc059dc: am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '6d3ea64599518fcbdceade5ebde7e08cc4613819':
Reduce PackageInstaller I/O pressure.
2014-10-07 00:56:00 +00:00
Yuncheol Heo
c104455512
am 684675f4: am d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
...
* commit '684675f44ddb8792affbb54fdc194fa944c4ba43':
Change visibility of RecordSource into public.
2014-10-07 00:55:24 +00:00
Jeff Sharkey
fcc059dcf0
am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '1d5ef81e29279f769d79315f2a38e747ea92e10f':
Reduce PackageInstaller I/O pressure.
2014-10-07 00:32:19 +00:00
Yuncheol Heo
d534b936d7
Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
2014-10-07 00:29:06 +00:00
Chris Craik
2cf2ae7231
am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1155ed1920fb93ff79e4e61fc928f6bd1d68c18c':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-07 00:13:22 +00:00
Jeff Sharkey
1d5ef81e29
am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
2014-10-06 23:59:43 +00:00
Jeff Sharkey
99586dc010
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
2014-10-06 23:51:56 +00:00
Chris Craik
0aa69ff2ff
am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 23:51:05 +00:00
Jeff Sharkey
02bd78490d
Reduce PackageInstaller I/O pressure.
...
When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.
This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.
Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
2014-10-06 16:38:15 -07:00
Andres Morales
052690540e
Remove dead NFC unlock code from fw/base
...
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
2014-10-06 16:04:19 -07:00
Chris Craik
1a6c41fbad
am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 22:35:19 +00:00
Chris Craik
6c9f0a0160
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
2014-10-06 22:06:23 +00:00
Chris Craik
f791703f9b
Avoid changeBounds animations on Views that are not yet laidout
...
bug:17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
2014-10-06 14:55:17 -07:00
Dianne Hackborn
8b718b80e0
am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:39:50 +00:00
John Spurlock
29ab5f7dc0
am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '42730c93466d2ff533b42f56b4dd0080aad40d59':
Fix NPE in StrictMode handling.
2014-10-06 19:39:41 +00:00
Dianne Hackborn
2f577e83cb
am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:22:53 +00:00
John Spurlock
b6f5cb3e45
am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
Fix NPE in StrictMode handling.
2014-10-06 19:22:44 +00:00
Dianne Hackborn
90d557b7a6
am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
John Spurlock
81b96aadbd
am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
2014-10-06 19:16:53 +00:00
Dianne Hackborn
7f7d240b13
Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
2014-10-06 18:48:34 +00:00
Benjamin Franz
adabf536fb
am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
...
* commit '00fcb749cbd26c83d1a29a974bd92967b41c5882':
Introduce new API to get an unbadged icon and unbadge permissions.
2014-10-06 16:52:27 +00:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
Benjamin Franz
31409c0ccd
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
2014-10-06 16:26:27 +00:00
vandwalle
542cc240b5
am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '88b927e258214a31342326d46f527528e5979f85':
add millisecond timestamp to locallog
2014-10-04 15:45:35 +00:00
John Reck
6e4140c6e2
am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
Cleanup DeferredLayerUpdater
2014-10-04 15:45:20 +00:00
vandwalle
c67e5ae2da
am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
add millisecond timestamp to locallog
2014-10-03 23:57:40 +00:00
John Reck
6a2296d856
am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:30 +00:00
vandwalle
4f5fd78019
am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
add millisecond timestamp to locallog
2014-10-03 23:53:17 +00:00
John Reck
9da6e74359
am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
2014-10-03 23:53:05 +00:00
vandwalle
68104b0529
Merge "add millisecond timestamp to locallog" into lmp-dev
2014-10-03 23:31:51 +00:00
Dianne Hackborn
2d7576b082
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
...
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.
Add a new REAL_GET_TASKS that is the actual permission now.
Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.
Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
vandwalle
c520aa89a3
add millisecond timestamp to locallog
...
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
2014-10-03 15:35:25 -07:00
John Reck
d988a45d60
Merge "Cleanup DeferredLayerUpdater" into lmp-dev
2014-10-03 22:22:52 +00:00
John Reck
749906b468
Cleanup DeferredLayerUpdater
...
Bug: 17765082
DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures
Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
2014-10-03 15:02:19 -07:00
Dianne Hackborn
cba999c164
am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 21:52:23 +00:00
Dianne Hackborn
6b1cf642fc
am 5ebb0e6a: am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 21:32:30 +00:00
Dianne Hackborn
5ebb0e6a1e
am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 19:21:06 +00:00