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
Derek Sollenberger
62a93760bf
Merge "Mutable Java Shaders with Immutable Native Shaders"
2014-10-07 13:34:10 +00:00
Yohei Yukawa
d2c6d121c1
Merge "Use try-with-resources"
2014-10-07 04:59:42 +00:00
Yohei Yukawa
a1d49337fb
Use try-with-resources
...
We can start relying on try-with-resources in framework.
Change-Id: Iac1194022065c41e8593524e483d6076d4ea72fa
2014-10-07 12:04:04 +09: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
b7dadf8dad
am 0cfe6f1d: am 6d3ea645: am fcc059dc: am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '0cfe6f1d2fbef4494779158db9662ee0b4561674':
Reduce PackageInstaller I/O pressure.
2014-10-07 01:03:36 +00:00
Yuncheol Heo
6e39e8a10d
am c1044555: am 684675f4: am d534b936: Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
...
* commit 'c10445551282270c49a0769050dd21ffeee53949':
Change visibility of RecordSource into public.
2014-10-07 01:03:06 +00:00
Christopher Tate
406abd4547
Accept any restored wallpaper
...
...and let the wallpaper service & hosts figure out what to do
with it.
Bug 17677006
Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
2014-10-06 18:00:51 -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
George Mount
f6c763d6a4
Protect against ImageView changing to a null Drawable during Transition.
...
Bug 17600191
Change-Id: I5918866dbb6594725f4712a92acdef23003e8f3e
2014-10-07 00:35:10 +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
cdc707b479
am 2cf2ae72: am 1155ed19: am 0aa69ff2: am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '2cf2ae7231544237d7ebbc7d4c823a8eb81e9b22':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-07 00:20:52 +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
5ca7ef1d8e
am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
2014-10-06 23:56:41 +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
6b85cbb5da
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:34:31 +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
22dbaddf58
am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:43:58 +00:00
John Spurlock
0816ecd0af
am 29ab5f7d: am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '29ab5f7dc0e9ba2ef3db2993d9ac5f9a48e9df12':
Fix NPE in StrictMode handling.
2014-10-06 19:43:49 +00: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
2131b18542
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 18:58:57 +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
John Spurlock
b76efc62de
am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
2014-10-06 18:00:09 +00:00
Derek Sollenberger
dfba4d3d11
Mutable Java Shaders with Immutable Native Shaders
...
bug: 17641888
Change-Id: I0f05387423cde185dab1a1453f89d5251ca1a4f9
2014-10-06 13:04:45 -04:00
Benjamin Franz
53ae7745b0
am adabf536: am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
...
* commit 'adabf536fbb971b2eb50a37f563e3027bda04061':
Introduce new API to get an unbadged icon and unbadge permissions.
2014-10-06 16:56:48 +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
3041a9e07d
am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83':
add millisecond timestamp to locallog
2014-10-04 16:06:17 +00:00
John Reck
b9ba53d088
am 6e4140c6: am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '6e4140c6e2d6f14ba225b2ae5926cc0f2794056a':
Cleanup DeferredLayerUpdater
2014-10-04 16:05:59 +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
Igor Murashkin
4b8cd6b44c
camera2: Update docs only for legacy devices
...
Bug: 17788234
Change-Id: Ie88f3750cc06d889c6750f2099598d53ccb601b7
2014-10-03 17:55:18 -07: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