Adam Powell
aa2e0fd9fd
am c928beac: am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev
...
* commit 'c928beac470156dfb22a993a3a7ea0c4f3f2bd10':
View measurement optimization
2014-10-16 00:37:19 +00:00
Adam Powell
c928beac47
am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev
...
* commit 'f8c7d87a65f7a94201d7aa3c7ff3f474b83f43db':
View measurement optimization
2014-10-16 00:32:14 +00:00
Adam Powell
19c0a1632f
Merge "View measurement optimization" into lmp-mr1-dev
2014-10-16 00:21:29 +00:00
Libin.Tang@motorola.com
0841572b99
am c2814749: am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.
...
* commit 'c28147490a0f7c5cceaaa4d0746ffa0d4842e8b6':
IMS:change enhanced 4g setting to store in setting db.
2014-10-16 00:06:30 +00:00
Libin.Tang@motorola.com
c28147490a
am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.
...
* commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b':
IMS:change enhanced 4g setting to store in setting db.
2014-10-15 23:56:23 +00:00
Libin.Tang@motorola.com
0499bb5de4
IMS:change enhanced 4g setting to store in setting db.
...
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
2014-10-15 16:12:39 -07:00
Adam Powell
9cefbda11e
View measurement optimization
...
If a view hasn't explicitly requested layout and it's asked to measure
with MeasureSpec.EXACTLY in both dimensions and sizes that match its
current measured size, the measure operation is a no-op.
This helps out a number of ViewGroups that perform initial speculative
measurements with AT_MOST or UNSPECIFIED followed by looping over
child views and measuring EXACTLY to lock in the final measurement
with perhaps some extra leftover space distributed. In practice this
happens a fair bit, especially for views high up in the view
hierarchy. This optimization allows ViewGroup measurement code to be a
little cleaner in not having to keep track of this on its own.
Change-Id: I88ff46a7d37aeda7a4cd16204b68cab0d051b341
2014-10-15 12:20:36 -07:00
Jim Miller
97f66f6754
am 26e4de2f: am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '26e4de2ff11c6e055a163fe20249e7f202629cb3':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:46:00 +00:00
Jim Miller
26e4de2ff1
am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '1a02efb1247569ae0e133c199295c873e4ad9b52':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:40:08 +00:00
Jim Miller
ce711c6d57
am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f
am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:26:59 +00:00
Jim Miller
e7c325559d
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
2014-10-15 18:21:52 +00:00
Amith Yamasani
8d0c97af73
am 2df0ce5e: am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '2df0ce5e2b73900452b8a1841938d3407469af41':
Fix admin policies in managed profiles
2014-10-15 18:16:54 +00:00
Amith Yamasani
2df0ce5e2b
am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit 'ecb7b899b022d2ecbee48324c1e4a524a596a29e':
Fix admin policies in managed profiles
2014-10-15 18:12:10 +00:00
Amith Yamasani
5c8cafa614
am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
Fix admin policies in managed profiles
2014-10-15 17:54:34 +00:00
Amith Yamasani
01ddc75fc1
am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
Fix admin policies in managed profiles
2014-10-15 17:49:19 +00:00
Amith Yamasani
2c3886cb34
Merge "Fix admin policies in managed profiles" into lmp-dev
2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259
Fix admin policies in managed profiles
...
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.
Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.
Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.
Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.
Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
2014-10-15 10:42:17 -07:00
Jeff Sharkey
5a4a37794a
am e6ba73e0: am fbfd900a: am 2df76285: am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit 'e6ba73e07b16b413f57a06218e55b4fcd8d98f21':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 17:15:53 +00:00
Jeff Sharkey
e6ba73e07b
am fbfd900a: am 2df76285: am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit 'fbfd900aa8a4721ce3ef84f5d08b5ecd67f16fd8':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 17:10:38 +00:00
Jeff Sharkey
2df7628591
am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit '203ed4db9656cc3047c65e12e3969d21652d4ccf':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:58:49 +00:00
Jeff Sharkey
203ed4db96
am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:09 +00:00
Jeff Sharkey
97d47ed036
Reduce PackageInstaller Binder memory pressure.
...
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions. To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.
Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
2014-10-15 09:19:54 -07:00
Neil Fuller
f4d51632a6
am 8ee06212: am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"
...
* commit '8ee062122f75f5f9e4904ed95ca3778e670c5f88':
Fix Time docs to document various error cases
2014-10-15 16:10:03 +00:00
Neil Fuller
8ee062122f
am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"
...
* commit '1802567a79b2fc94aa1dff387cd55db8521cdca6':
Fix Time docs to document various error cases
2014-10-15 16:05:55 +00:00
Neil Fuller
1802567a79
am e4625cc1: Merge "Fix Time docs to document various error cases"
...
* commit 'e4625cc1a861615f4b3447e2a4d4990590d51470':
Fix Time docs to document various error cases
2014-10-15 16:01:01 +00:00
Neil Fuller
e4625cc1a8
Merge "Fix Time docs to document various error cases"
2014-10-15 15:56:06 +00:00
Neil Fuller
7079f2003c
Fix Time docs to document various error cases
...
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
2014-10-15 12:08:05 +01:00
Jeff Sharkey
7b2993c565
am 6449ba6d: am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller.
...
* commit '6449ba6d8c12747e74ab6d1fd0fa8730f4a5d512':
Start cross profile intents as caller.
2014-10-15 03:35:39 +00:00
Jeff Sharkey
6449ba6d8c
am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller.
...
* commit '92ab2748efc185a347d11e1382d54b86ffd22799':
Start cross profile intents as caller.
2014-10-15 03:21:58 +00:00
Alan Viverette
96f517c1d4
am db2031e2: am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev
...
* commit 'db2031e215ab9aca0d41a0dd7f8f571f6bd94110':
Send VIEW_SELECTED event when View selection state changes
2014-10-15 03:06:26 +00:00
Alan Viverette
db2031e215
am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev
...
* commit 'ba4bbe79c2610bd4c0525837ad6654e0e36fd32d':
Send VIEW_SELECTED event when View selection state changes
2014-10-15 02:30:22 +00:00
Amith Yamasani
bc460b9c03
am d060a29e: am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit 'd060a29e52fc73be53d643f74a9335652bd818ca':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-15 02:22:05 +00:00
Dianne Hackborn
cfd38a3c63
am 133c747e: am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit '133c747e1008069a31cf9b2f25955fff0a650a04':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-15 02:22:01 +00:00
Jeff Sharkey
4d526bd249
am cf2c5649: am 97978808: Start cross profile intents as caller.
...
* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
Start cross profile intents as caller.
2014-10-15 02:19:26 +00:00
Jeff Sharkey
cf2c564987
am 97978808: Start cross profile intents as caller.
...
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
Start cross profile intents as caller.
2014-10-15 02:05:56 +00:00
Amith Yamasani
d060a29e52
am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-15 02:04:06 +00:00
Dianne Hackborn
133c747e10
am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-15 02:03:59 +00:00
Jeff Sharkey
9797880808
Start cross profile intents as caller.
...
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.
Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
2014-10-14 17:57:28 -07:00
Alan Viverette
6f1edae88c
Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev
2014-10-14 23:52:23 +00:00
Jim Miller
6848dc8e3b
Add a checkbox option to 'require password to decrypt'
...
Fixes bug 17881324
Change-Id: Id94e593a172d686339c736473226fece1bb749ee
2014-10-14 16:26:11 -07:00
Jeff Hao
1201d2a018
am dbfbb175: Backport of ordering apps for boot dexopt.
...
* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
Backport of ordering apps for boot dexopt.
2014-10-14 22:31:16 +00:00
Amith Yamasani
2079133871
am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 22:04:01 +00:00
Jeff Hao
dbfbb17512
Backport of ordering apps for boot dexopt.
...
This is a squashed commit of the following changes:
1. Order apps by priority when performing boot dexopt.
(cherry picked from commit 65cde7d42d )
2. Improve priority ordering of apps when performing boot dexopt.
Added core apps and updated system apps.
(cherry picked from commit 272bf3a274 )
3. Stop boot dexopt when low on memory.
(cherry picked from commit 1d892dcb6b )
Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
2014-10-14 15:02:37 -07:00
Dianne Hackborn
f23b29ad5a
am a861a9d7: am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-14 19:58:39 +00:00
Amith Yamasani
4bf0356ee2
am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 19:57:46 +00:00
Amith Yamasani
15a5f82f9b
Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
2014-10-14 19:51:15 +00:00
Dianne Hackborn
a861a9d713
am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-14 19:21:18 +00:00
Dianne Hackborn
35de0e2872
Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
2014-10-14 19:16:22 +00:00
John Spurlock
c23059bedf
am 9766d5b2: am 23e47ce6: am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev
...
* commit '9766d5b236394dbc988619a4e0236621add3c6b6':
Make SeekBarVolumizer restartable.
2014-10-14 19:04:38 +00:00