OSDN Git Service
Lorenzo Colitti [Thu, 16 Oct 2014 09:22:47 +0000 (09:22 +0000)]
am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
917c547beb9adecf2e7d2b355e85e37c2557c5d3':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 09:22:42 +0000 (09:22 +0000)]
am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
28dcf0345b2857884c1f1639fadb720318445187':
Propagate network state changes to the LockdownVpnTracker.
Lorenzo Colitti [Thu, 16 Oct 2014 08:45:02 +0000 (08:45 +0000)]
Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev
Lorenzo Colitti [Thu, 16 Oct 2014 08:37:26 +0000 (08:37 +0000)]
Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
Christopher Tate [Thu, 16 Oct 2014 03:33:46 +0000 (03:33 +0000)]
am
185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '
185fcadf898f0fe41461a632177dfd0d7e5dfb70':
Fix spurious restore session timeouts
Christopher Tate [Thu, 16 Oct 2014 03:28:58 +0000 (03:28 +0000)]
Merge "Fix spurious restore session timeouts" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 01:47:37 +0000 (01:47 +0000)]
am
c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c71a7b3cb8eb1565c01caaf231773759ee63b4cf':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 01:35:17 +0000 (01:35 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 01:34:07 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
Christopher Tate [Thu, 16 Oct 2014 00:49:42 +0000 (17:49 -0700)]
Fix spurious restore session timeouts
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work. We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation. The timer is already correctly resumed
when restore operations conclude.
(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow. The
timeout is reestablished when the wakelock is released; this part
is already in the code.)
Bug
17990544
Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
Brian Carlstrom [Thu, 16 Oct 2014 01:19:51 +0000 (01:19 +0000)]
am
20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
* commit '
20de619d66a594fd9e6e76a3a2cb79422aef577c':
Set threads' contextClassLoader during LoadedApk.makeApplication.
Brian Carlstrom [Thu, 16 Oct 2014 01:01:25 +0000 (01:01 +0000)]
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
Marco Nelissen [Thu, 16 Oct 2014 00:42:04 +0000 (00:42 +0000)]
am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
36c931b31a15b4ed740c861ec34b7e6573cfd32e':
Also consider secondary storage when verifying paths
Marco Nelissen [Thu, 16 Oct 2014 00:38:01 +0000 (00:38 +0000)]
Merge "Also consider secondary storage when verifying paths" into lmp-dev
Dirk Dougherty [Thu, 16 Oct 2014 00:23:32 +0000 (00:23 +0000)]
am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
a0b3796d937dff83b5dd94e8f091a36bc9b304dd':
Doc change: Add diffs for API level 21.
Dirk Dougherty [Thu, 16 Oct 2014 00:20:01 +0000 (00:20 +0000)]
Merge "Doc change: Add diffs for API level 21." into lmp-dev
Quddus Chong [Wed, 15 Oct 2014 23:59:00 +0000 (23:59 +0000)]
am
0a276b94: Merge "docs: Added L API overview." into lmp-dev
* commit '
0a276b9448d907822bee1c3009608694fc480fcc':
docs: Added L API overview.
Dirk Dougherty [Wed, 15 Oct 2014 23:58:49 +0000 (23:58 +0000)]
am
8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
* commit '
8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
Doc change: Add diffs for l-preview -> API level 21.
Geoff Mendal [Wed, 15 Oct 2014 23:58:39 +0000 (23:58 +0000)]
am
e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e2a1f1cd885ae73fc165f0623697b94668e01c86':
Import translations. DO NOT MERGE
Craig Mautner [Wed, 15 Oct 2014 23:58:29 +0000 (23:58 +0000)]
am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
5d460b88715c8a902eb3930e690ddd1b8d84338f':
Remove unnecessary logging.
Eric Rowe [Wed, 15 Oct 2014 23:58:19 +0000 (23:58 +0000)]
am
1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit '
1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
Add CHANGE_NETWORK_STATE permission to bt tests
Craig Mautner [Wed, 15 Oct 2014 23:57:55 +0000 (23:57 +0000)]
am
e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '
e52791055c855a957cad767dfa9889faae86660c':
Move desired task to top if not already there.
John Spurlock [Wed, 15 Oct 2014 23:57:50 +0000 (23:57 +0000)]
am
b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '
b2344c81bcf49129d303a2919cfffd7a720c261b':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Evan Charlton [Wed, 15 Oct 2014 23:57:38 +0000 (23:57 +0000)]
am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
843e234318421b320e74bb2d09c3b436d82ee127':
Add WindowManager.aidl to AIDL list
RoboErik [Wed, 15 Oct 2014 23:57:11 +0000 (23:57 +0000)]
am
c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '
c7be69f1d63bcc8411875ff53e5561f2f4692072':
Don't call size on a null metadata
Tom Taylor [Wed, 15 Oct 2014 23:57:03 +0000 (23:57 +0000)]
am
6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev
* commit '
6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Quddus Chong [Wed, 15 Oct 2014 23:26:41 +0000 (23:26 +0000)]
Merge "docs: Added L API overview." into lmp-dev
Dirk Dougherty [Wed, 15 Oct 2014 22:40:17 +0000 (22:40 +0000)]
Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
Marco Nelissen [Wed, 15 Oct 2014 21:32:22 +0000 (14:32 -0700)]
Also consider secondary storage when verifying paths
Bug:
17673184
Bug:
17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
Dirk Dougherty [Sat, 11 Oct 2014 02:27:18 +0000 (19:27 -0700)]
Doc change: Add diffs for API level 21.
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
Dirk Dougherty [Sat, 11 Oct 2014 02:28:51 +0000 (19:28 -0700)]
Doc change: Add diffs for l-preview -> API level 21.
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
Geoff Mendal [Wed, 15 Oct 2014 21:52:22 +0000 (21:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Craig Mautner [Wed, 15 Oct 2014 21:48:51 +0000 (21:48 +0000)]
Merge "Remove unnecessary logging." into lmp-dev
Geoff Mendal [Wed, 15 Oct 2014 21:37:19 +0000 (14:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
Eric Rowe [Wed, 15 Oct 2014 21:35:31 +0000 (21:35 +0000)]
Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
Craig Mautner [Wed, 15 Oct 2014 21:30:02 +0000 (14:30 -0700)]
Remove unnecessary logging.
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
Craig Mautner [Wed, 15 Oct 2014 21:13:54 +0000 (21:13 +0000)]
Merge "Move desired task to top if not already there." into lmp-dev
Craig Mautner [Wed, 15 Oct 2014 19:52:10 +0000 (12:52 -0700)]
Move desired task to top if not already there.
Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.
This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.
Also make activity dump ordering consistent.
Fixes bug
17721767.
Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
Eric Rowe [Wed, 15 Oct 2014 18:24:09 +0000 (11:24 -0700)]
Add CHANGE_NETWORK_STATE permission to bt tests
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
John Spurlock [Wed, 15 Oct 2014 21:04:32 +0000 (21:04 +0000)]
Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
Evan Charlton [Wed, 15 Oct 2014 20:23:57 +0000 (13:23 -0700)]
Add WindowManager.aidl to AIDL list
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.
This affects the SDK only
Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
Quddus Chong [Mon, 6 Oct 2014 21:57:45 +0000 (14:57 -0700)]
docs: Added L API overview.
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
RoboErik [Wed, 15 Oct 2014 19:48:49 +0000 (19:48 +0000)]
Merge "Don't call size on a null metadata" into lmp-dev
Prashant Malani [Wed, 15 Oct 2014 19:22:03 +0000 (19:22 +0000)]
am
c64522fb: am
645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
* commit '
c64522fb2e1893c21b1b1cc9051a3d1013c5d987':
DO NOT MERGE Add empty ArrayList check.
Ricardo Cervera [Wed, 15 Oct 2014 19:21:58 +0000 (19:21 +0000)]
am
7e50d970: am
dc1f3080: am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
7e50d9706cd0d7cd5c58c976fd582c81478a975c':
docs: Fixing notify link. Bug:
17571861
Luan Nguyen [Wed, 15 Oct 2014 19:21:53 +0000 (19:21 +0000)]
am
bff5c193: am
c07a288a: am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
docs: Android Wear Design fixes
smain@google.com [Wed, 15 Oct 2014 19:21:48 +0000 (19:21 +0000)]
am
b3994c2e: am
e43bb6a9: am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
b3994c2e58c7cebef8274ff6d801819a2b189183':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 19:21:43 +0000 (19:21 +0000)]
am
2912627e: am
6fbe299f: am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
2912627e007b95cf4b16c9e52a3acbec0c8bae60':
update analytics event tracking calls to use new script bug:
16331906
Tom Taylor [Wed, 15 Oct 2014 19:20:35 +0000 (19:20 +0000)]
Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev
RoboErik [Wed, 15 Oct 2014 19:17:43 +0000 (12:17 -0700)]
Don't call size on a null metadata
bug:
18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
Prashant Malani [Wed, 15 Oct 2014 19:12:33 +0000 (19:12 +0000)]
am
645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
* commit '
645e017ca54e654c34b131235e90589a7d92ce0c':
DO NOT MERGE Add empty ArrayList check.
Ricardo Cervera [Wed, 15 Oct 2014 19:12:26 +0000 (19:12 +0000)]
am
dc1f3080: am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
dc1f308048a732572fae3cf92ddfe5cd943c0059':
docs: Fixing notify link. Bug:
17571861
Luan Nguyen [Wed, 15 Oct 2014 19:12:18 +0000 (19:12 +0000)]
am
c07a288a: am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
c07a288a889ac88282118d4089e969f20c1aabe3':
docs: Android Wear Design fixes
smain@google.com [Wed, 15 Oct 2014 19:12:05 +0000 (19:12 +0000)]
am
e43bb6a9: am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 19:11:43 +0000 (19:11 +0000)]
am
6fbe299f: am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
update analytics event tracking calls to use new script bug:
16331906
Jim Miller [Wed, 15 Oct 2014 18:26:02 +0000 (18:26 +0000)]
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'
Jim Miller [Wed, 15 Oct 2014 18:21:50 +0000 (18:21 +0000)]
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
Amith Yamasani [Wed, 15 Oct 2014 17:48:50 +0000 (17:48 +0000)]
am
2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '
2c3886cb3463ff39c1986c5b85eba79748dd8c24':
Fix admin policies in managed profiles
Amith Yamasani [Wed, 15 Oct 2014 17:44:23 +0000 (17:44 +0000)]
Merge "Fix admin policies in managed profiles" into lmp-dev
Amith Yamasani [Tue, 14 Oct 2014 23:06:13 +0000 (16:06 -0700)]
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
John Spurlock [Wed, 15 Oct 2014 16:03:48 +0000 (12:03 -0400)]
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Apps can end up in priority mode by setting ringer-mode = silent.
Now they can leave priority mode by setting ringer-mode = non-silent.
(normal or vibrate)
Bug:
17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
Tom Taylor [Wed, 15 Oct 2014 17:20:17 +0000 (10:20 -0700)]
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Bug
17969135
Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.
Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
Chih-Hung Hsieh [Wed, 15 Oct 2014 17:14:25 +0000 (17:14 +0000)]
am
57622210: (-s ours) am
e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)"
* commit '
57622210fb9c8f9af21b85e87e93b7081db9f99c':
Fix log call output format error. (DO NOT MERGE)
Chih-Hung Hsieh [Wed, 15 Oct 2014 17:09:03 +0000 (17:09 +0000)]
am
e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)"
* commit '
e67bc0c96733cee01e6f3027d9e6243f10ebbe40':
Fix log call output format error. (DO NOT MERGE)
Chih-Hung Hsieh [Wed, 15 Oct 2014 17:03:06 +0000 (17:03 +0000)]
Merge "Fix log call output format error. (DO NOT MERGE)"
Prashant Malani [Wed, 15 Oct 2014 17:02:00 +0000 (17:02 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
Jeff Sharkey [Wed, 15 Oct 2014 16:53:28 +0000 (16:53 +0000)]
am
88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '
88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
Reduce PackageInstaller Binder memory pressure.
Jeff Sharkey [Wed, 15 Oct 2014 16:49:04 +0000 (16:49 +0000)]
Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
Chih-Hung Hsieh [Wed, 8 Oct 2014 17:50:23 +0000 (10:50 -0700)]
Fix log call output format error. (DO NOT MERGE)
Cherry picked from googleplex-android c/445200.
BUG:
17916851
Change-Id: If4077e94d6dc7ef31ecf09cbcf41091c7e30268f
Tony Hill [Wed, 15 Oct 2014 16:27:12 +0000 (16:27 +0000)]
am
8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network
* commit '
8e0297155075f9772dd6e8b8194da074dca008f8':
Do not show roaming icon for BT Mobile SIM camped on EE UK network
Jeff Sharkey [Wed, 15 Oct 2014 16:19:47 +0000 (09:19 -0700)]
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
Lorenzo Colitti [Wed, 15 Oct 2014 15:55:07 +0000 (00:55 +0900)]
Don't make lockdown VPN source firewall rules over-broad.
Currently, the lockdown VPN adds firewall allow rules matching
the whole subnet that the server assigned, so for example if
the VPN server assigns it the IP address 10.1.23.5/8, it will
allow the whole of 10.0.0.0/8 to pass the firewall.
This is needlessly overbroad and has a particularly bad corner
case where if the prefix length is 0, everything is allowed.
Bug:
17695048
Change-Id: Idbec4b3aea0f72f9bdfd26dcd72d6a97d026fb12
Lorenzo Colitti [Wed, 15 Oct 2014 07:06:07 +0000 (16:06 +0900)]
Propagate network state changes to the LockdownVpnTracker.
Bug:
17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
Neil Fuller [Wed, 15 Oct 2014 16:05:56 +0000 (16:05 +0000)]
am
1802567a: am
e4625cc1: Merge "Fix Time docs to document various error cases"
* commit '
1802567a79b2fc94aa1dff387cd55db8521cdca6':
Fix Time docs to document various error cases
Neil Fuller [Wed, 15 Oct 2014 16:01:01 +0000 (16:01 +0000)]
am
e4625cc1: Merge "Fix Time docs to document various error cases"
* commit '
e4625cc1a861615f4b3447e2a4d4990590d51470':
Fix Time docs to document various error cases
Neil Fuller [Wed, 15 Oct 2014 15:56:05 +0000 (15:56 +0000)]
Merge "Fix Time docs to document various error cases"
Ricardo Cervera [Wed, 15 Oct 2014 15:50:42 +0000 (15:50 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
docs: Fixing notify link. Bug:
17571861
Ricardo Cervera [Wed, 15 Oct 2014 15:47:30 +0000 (15:47 +0000)]
Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
Luan Nguyen [Wed, 15 Oct 2014 15:17:40 +0000 (15:17 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
docs: Android Wear Design fixes
Luan Nguyen [Wed, 15 Oct 2014 15:12:23 +0000 (15:12 +0000)]
Merge "docs: Android Wear Design fixes" into klp-modular-docs
Tony Hill [Tue, 14 Oct 2014 14:45:39 +0000 (15:45 +0100)]
Do not show roaming icon for BT Mobile SIM camped on EE UK network
Bug:
17986042
Change-Id: Ia9802c12363bbe6e93cf0b2e524351b6a3f4871c
Neil Fuller [Tue, 30 Sep 2014 10:47:19 +0000 (11:47 +0100)]
Fix Time docs to document various error cases
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
Narayan Kamath [Wed, 15 Oct 2014 10:38:44 +0000 (11:38 +0100)]
Set threads' contextClassLoader during LoadedApk.makeApplication.
We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.
bug:
17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
Jinsuk Kim [Wed, 15 Oct 2014 05:15:13 +0000 (05:15 +0000)]
am
5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
* commit '
5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
DO NOT MERGE CEC: Queue actions for starting later when not ready
Jinsuk Kim [Wed, 15 Oct 2014 05:10:58 +0000 (05:10 +0000)]
Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
smain@google.com [Wed, 15 Oct 2014 03:36:11 +0000 (03:36 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
075531ae190dd6e64d3a53991a209a624cb0ec63':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 02:34:43 +0000 (19:34 -0700)]
add the butterbar for L announce to Preview landing page
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
smain@google.com [Wed, 15 Oct 2014 02:15:35 +0000 (02:15 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
d8d20f52ec0550477b773cee4c0f0343f2a9301f':
update analytics event tracking calls to use new script bug:
16331906
smain@google.com [Wed, 8 Oct 2014 23:53:42 +0000 (16:53 -0700)]
update analytics event tracking calls to use new script
bug:
16331906
Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
Jeff Sharkey [Wed, 15 Oct 2014 01:59:18 +0000 (01:59 +0000)]
am
97978808: Start cross profile intents as caller.
* commit '
9797880808320e3a7bae1f59bc7e0c5a13189e5f':
Start cross profile intents as caller.
Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]
DO NOT MERGE Add empty ArrayList check.
Fixes bug
15768779.
Fixes bug
17955259.
Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
Jeff Sharkey [Tue, 14 Oct 2014 17:48:18 +0000 (10:48 -0700)]
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
Svetoslav [Wed, 15 Oct 2014 00:07:22 +0000 (00:07 +0000)]
am
dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev
* commit '
dc876b56217c588596661ca514b4bdb8a6cfe843':
Fix a NPE in device policy manager service.
Svetoslav [Wed, 15 Oct 2014 00:02:58 +0000 (00:02 +0000)]
Merge "Fix a NPE in device policy manager service." into lmp-dev
Jinsuk Kim [Fri, 10 Oct 2014 05:40:29 +0000 (14:40 +0900)]
DO NOT MERGE CEC: Queue actions for starting later when not ready
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.
Bug:
17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
Conflicts:
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
Craig Mautner [Tue, 14 Oct 2014 23:41:12 +0000 (23:41 +0000)]
am
ea496644: Merge "Add null check" into lmp-dev
* commit '
ea4966442cd035e592aa73c0c29225efe3f091fb':
Add null check
Craig Mautner [Tue, 14 Oct 2014 23:35:31 +0000 (23:35 +0000)]
Merge "Add null check" into lmp-dev
Jim Miller [Tue, 14 Oct 2014 01:51:53 +0000 (18:51 -0700)]
Add a checkbox option to 'require password to decrypt'
Fixes bug
17881324
Change-Id: Id94e593a172d686339c736473226fece1bb749ee
Craig Mautner [Tue, 14 Oct 2014 23:17:06 +0000 (16:17 -0700)]
Add null check
Unable to examine bugreports that die in the middle of dump().
Help for bug
17721767.
Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
Svetoslav [Tue, 14 Oct 2014 22:53:14 +0000 (15:53 -0700)]
Fix a NPE in device policy manager service.
It is possible that the device does not have an owner. If there
is no owner we get a NPE when asking the device policy manager
for cross-profile widget providers.
bug:
17989189
Change-Id: I5759f2dec160ed8076ab47fdf09134f78c57458d