OSDN Git Service
Alan Viverette [Thu, 16 Oct 2014 00:46:22 +0000 (00:46 +0000)]
Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev
Alan Viverette [Thu, 16 Oct 2014 00:44:34 +0000 (00:44 +0000)]
Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
Adam Powell [Thu, 16 Oct 2014 00:21:28 +0000 (00:21 +0000)]
Merge "View measurement optimization" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 00:21:25 +0000 (00:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Alan Viverette [Thu, 16 Oct 2014 00:19:30 +0000 (17:19 -0700)]
Add style support to PopupMenu, clean up constructor javadoc
BUG:
18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
Geoff Mendal [Thu, 16 Oct 2014 00:16:40 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
xinhe [Wed, 15 Oct 2014 23:41:52 +0000 (23:41 +0000)]
Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev
xinhe [Wed, 15 Oct 2014 21:05:26 +0000 (14:05 -0700)]
Sprint: MMS proxy authorization does not include NAI
Read the NAI from CSIM and pass it to MMS module
Bug:
17752727
Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
Tom Taylor [Wed, 15 Oct 2014 23:24:54 +0000 (23:24 +0000)]
am
522fe28e: am
6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev
* commit '
522fe28e3d8da3d8c094d668071368fdc738e74b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Prashant Malani [Wed, 15 Oct 2014 23:24:50 +0000 (23:24 +0000)]
am
0227cebc: am
c64522fb: am
645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
* commit '
0227cebcb2faaf364c76b94e4cc5a5c9adcf1528':
DO NOT MERGE Add empty ArrayList check.
Ricardo Cervera [Wed, 15 Oct 2014 23:24:46 +0000 (23:24 +0000)]
am
e0cf20b5: am
7e50d970: am
dc1f3080: am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
e0cf20b5051dc107d5f905696a948f69272c6c1f':
docs: Fixing notify link. Bug:
17571861
Luan Nguyen [Wed, 15 Oct 2014 23:24:42 +0000 (23:24 +0000)]
am
faea1ffa: am
bff5c193: am
c07a288a: am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
faea1ffab25ec5164c02881d16909706b8aebed9':
docs: Android Wear Design fixes
smain@google.com [Wed, 15 Oct 2014 23:24:38 +0000 (23:24 +0000)]
am
fcebd6c3: am
b3994c2e: am
e43bb6a9: am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
fcebd6c32069a23f539a860a3f9363893cfed146':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 23:24:34 +0000 (23:24 +0000)]
am
24ff6491: am
2912627e: am
6fbe299f: am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
24ff6491f1380a9fe89867bb6202d33bc6185a76':
update analytics event tracking calls to use new script bug:
16331906
Geoff Mendal [Wed, 15 Oct 2014 23:24:23 +0000 (23:24 +0000)]
am
7b5d78f8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
7b5d78f89092852d7f7b2c73d73e2b769ec6dd35':
Import translations. DO NOT MERGE
Tom Taylor [Wed, 15 Oct 2014 23:15:26 +0000 (23:15 +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
Prashant Malani [Wed, 15 Oct 2014 23:14:27 +0000 (23:14 +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 23:14:24 +0000 (23:14 +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 23:14:17 +0000 (23:14 +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 23:14:12 +0000 (23:14 +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 23:14:07 +0000 (23:14 +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
Libin.Tang@motorola.com [Fri, 10 Oct 2014 19:55:57 +0000 (14:55 -0500)]
IMS:change enhanced 4g setting to store in setting db.
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
Geoff Mendal [Wed, 15 Oct 2014 22:38:38 +0000 (22:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 15 Oct 2014 22:19:49 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Oct 2014 22:01:59 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 15 Oct 2014 21:59:09 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
Alan Viverette [Wed, 15 Oct 2014 21:17:58 +0000 (21:17 +0000)]
Merge "Avoid saveLayer in RippleDrawable if the background won't draw" into lmp-mr1-dev
Jay Shrauner [Wed, 15 Oct 2014 19:59:18 +0000 (19:59 +0000)]
Merge "Remove unused onConferenceWith method" into lmp-mr1-dev
Andrew Lee [Wed, 15 Oct 2014 19:29:55 +0000 (19:29 +0000)]
Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev
Adam Powell [Wed, 15 Oct 2014 02:15:18 +0000 (19:15 -0700)]
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
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
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
Nancy Chen [Wed, 15 Oct 2014 18:50:38 +0000 (18:50 +0000)]
am
9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev
* commit '
9faf13b47467916897cf5c019a3a74df871b8f65':
Add API method to extract subscription ID from phone account (1/3)
Jay Shrauner [Wed, 15 Oct 2014 18:47:30 +0000 (11:47 -0700)]
Remove unused onConferenceWith method
Never part of public API
Bug:
17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
Nancy Chen [Wed, 15 Oct 2014 18:47:01 +0000 (18:47 +0000)]
Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev
Jim Miller [Wed, 15 Oct 2014 18:31:32 +0000 (18:31 +0000)]
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'
Jim Miller [Wed, 15 Oct 2014 18:26:59 +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:54:34 +0000 (17:54 +0000)]
am
01ddc75f: am
2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '
01ddc75fc1e9ea28212512299132e9bdace60e05':
Fix admin policies in managed profiles
Amith Yamasani [Wed, 15 Oct 2014 17:49:19 +0000 (17:49 +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
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
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:58:49 +0000 (16:58 +0000)]
am
203ed4db: am
88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '
203ed4db9656cc3047c65e12e3969d21652d4ccf':
Reduce PackageInstaller Binder memory pressure.
Jeff Sharkey [Wed, 15 Oct 2014 16:53:09 +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
Tony Hill [Wed, 15 Oct 2014 16:32:46 +0000 (16:32 +0000)]
am
a5380d96: am
8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network
* commit '
a5380d9664f89a8f46165e4186eb023f8f392301':
Do not show roaming icon for BT Mobile SIM camped on EE UK network
Tony Hill [Wed, 15 Oct 2014 16:27:28 +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
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
Jeff Davidson [Wed, 15 Oct 2014 15:49:25 +0000 (15:49 +0000)]
Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev
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
Tyler Gunn [Wed, 15 Oct 2014 15:15:23 +0000 (15:15 +0000)]
Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev
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
Jinsuk Kim [Wed, 15 Oct 2014 05:55:57 +0000 (14:55 +0900)]
resolved conflicts for merge of
f9a924ab to lmp-mr1-dev
Change-Id: Ic0693b6f2fdb2ea32a280297624b1fe435385deb
Jinsuk Kim [Wed, 15 Oct 2014 05:16:12 +0000 (05:16 +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
Jeff Sharkey [Wed, 15 Oct 2014 02:19:26 +0000 (02:19 +0000)]
am
cf2c5649: am
97978808: Start cross profile intents as caller.
* commit '
cf2c564987965be1241fe197106b3ec22b11b4b0':
Start cross profile intents as caller.
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
Jeff Sharkey [Wed, 15 Oct 2014 02:05:56 +0000 (02:05 +0000)]
am
97978808: Start cross profile intents as caller.
* commit '
9797880808320e3a7bae1f59bc7e0c5a13189e5f':
Start cross profile intents as caller.
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
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:13:03 +0000 (00:13 +0000)]
am
1a55dcce: am
dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev
* commit '
1a55dcceaa37d224312ab4b3e4ee31034fa3636d':
Fix a NPE in device policy manager service.
Svetoslav [Wed, 15 Oct 2014 00:07:27 +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
Andrew Lee [Tue, 14 Oct 2014 23:55:26 +0000 (16:55 -0700)]
Add helper method for checking phone capabilities.
I'm figuring this can help standardize phone capability checks when
need to do all over the place.
Bug:
17429707
Change-Id: I97327fd08158de3c18d186b6092597a1d4abcf14
Alan Viverette [Tue, 14 Oct 2014 23:52:21 +0000 (23:52 +0000)]
Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-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:46:22 +0000 (23:46 +0000)]
am
27f80673: am
ea496644: Merge "Add null check" into lmp-dev
* commit '
27f80673a0bc8997a8f878d2a062defd0f43379e':
Add null check
Craig Mautner [Tue, 14 Oct 2014 23:41:26 +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
Tom Taylor [Tue, 14 Oct 2014 23:15:08 +0000 (23:15 +0000)]
Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev
Winson Chung [Tue, 14 Oct 2014 22:54:13 +0000 (22:54 +0000)]
Merge "Fixing regression with screen pinning button not animating for the first task. (Bug
17985087)" into lmp-mr1-dev
Winson Chung [Tue, 14 Oct 2014 00:44:35 +0000 (17:44 -0700)]
Fixing regression with screen pinning button not animating for the first task. (Bug
17985087)
Change-Id: I81b8b5d6521c99023bbaf903d1bfb95015fbe756
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
Winson Chung [Tue, 14 Oct 2014 22:53:04 +0000 (22:53 +0000)]
Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug
17875770)" into lmp-mr1-dev
Winson Chung [Tue, 14 Oct 2014 00:28:27 +0000 (17:28 -0700)]
Fixing issue with excluded tasks sometimes showing in Recents. (Bug
17875770)
Change-Id: Ie94d485580db271256581e2a9f277fe38387d45c
Jason Monk [Tue, 14 Oct 2014 22:51:48 +0000 (22:51 +0000)]
am
a1a0131a: am
f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
* commit '
a1a0131a4adf8fa701a6a25488e1eb13f82dc2c2':
Update screen pinning and recents strings to say Overview
Winson Chung [Tue, 14 Oct 2014 22:50:29 +0000 (22:50 +0000)]
Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev
Alan Viverette [Tue, 14 Oct 2014 22:47:36 +0000 (22:47 +0000)]
Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev
Jason Monk [Tue, 14 Oct 2014 22:47:21 +0000 (22:47 +0000)]
am
f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
* commit '
f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
Update screen pinning and recents strings to say Overview
Winson Chung [Tue, 14 Oct 2014 22:47:12 +0000 (22:47 +0000)]
Merge "Adding mouse wheel support. (Bug
17323718)" into lmp-mr1-dev
Jason Monk [Tue, 14 Oct 2014 22:42:52 +0000 (22:42 +0000)]
Merge "Update screen pinning and recents strings to say Overview" into lmp-dev
Selim Cinek [Tue, 14 Oct 2014 22:37:21 +0000 (22:37 +0000)]
am
351ec77b: am
cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
* commit '
351ec77ba5685e8bad16df87284d9d3aaac159a1':
Fixed a bug when double tapping a notification in the normal shade
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:37:16 +0000 (22:37 +0000)]
am
ac293d16: am
a4f9c087: am
c93723bd: am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
ac293d16b750e300da44f543ca6bd5b8d01e2b08':
Revert "docs: Watermarked images for codes that weren't found."
Jeff Hao [Tue, 14 Oct 2014 22:37:03 +0000 (22:37 +0000)]
am
1201d2a0: am
dbfbb175: Backport of ordering apps for boot dexopt.
* commit '
1201d2a018c85e9c5092e670b334cc4ed4ebcaef':
Backport of ordering apps for boot dexopt.
Selim Cinek [Tue, 14 Oct 2014 22:31:27 +0000 (22:31 +0000)]
am
cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
* commit '
cedb6dc7f2e19120d6889bc681d143bfb2891b80':
Fixed a bug when double tapping a notification in the normal shade
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:31:21 +0000 (22:31 +0000)]
am
a4f9c087: am
c93723bd: am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
a4f9c0873f1d414d6721989f44d88de9a1f6d01a':
Revert "docs: Watermarked images for codes that weren't found."