OSDN Git Service
Marco Nelissen [Thu, 16 Oct 2014 17:45:36 +0000 (17:45 +0000)]
am
4683a10f: am
36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '
4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
Also consider secondary storage when verifying paths
Dirk Dougherty [Thu, 16 Oct 2014 17:45:31 +0000 (17:45 +0000)]
am
0cd670b3: am
a0b3796d: Merge "Doc change: Add diffs for API level 21." into lmp-dev
* commit '
0cd670b39be13e1840927694b36d6c61e5c7c1dd':
Doc change: Add diffs for API level 21.
Adrian Roos [Thu, 16 Oct 2014 14:54:18 +0000 (14:54 +0000)]
Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
George Mount [Thu, 16 Oct 2014 14:21:41 +0000 (14:21 +0000)]
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
Quddus Chong [Thu, 16 Oct 2014 05:52:08 +0000 (05:52 +0000)]
am
073c80d3: am
0a276b94: Merge "docs: Added L API overview." into lmp-dev
* commit '
073c80d346e053532092efec9c2c12a3a39d2dcd':
docs: Added L API overview.
Dirk Dougherty [Thu, 16 Oct 2014 05:52:04 +0000 (05:52 +0000)]
am
41d5d14d: am
8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev
* commit '
41d5d14df218d2711be0b16b0f15ddd4cabf3a4f':
Doc change: Add diffs for l-preview -> API level 21.
Geoff Mendal [Thu, 16 Oct 2014 05:52:01 +0000 (05:52 +0000)]
am
e134ac1c: (-s ours) am
e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e134ac1cece66293b31543948fbabc5b7fc64b94':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 16 Oct 2014 05:51:56 +0000 (05:51 +0000)]
am
d1a58c45: am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
d1a58c45fee09c5e599fe173d5055546fe147b03':
Remove unnecessary logging.
Eric Rowe [Thu, 16 Oct 2014 05:51:52 +0000 (05:51 +0000)]
am
de96b966: am
1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit '
de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
Add CHANGE_NETWORK_STATE permission to bt tests
Craig Mautner [Thu, 16 Oct 2014 05:51:48 +0000 (05:51 +0000)]
am
87441860: am
e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '
87441860bf4df2da7ce4537ad31c8240547da655':
Move desired task to top if not already there.
John Spurlock [Thu, 16 Oct 2014 05:51:45 +0000 (05:51 +0000)]
am
3d4aec1b: am
b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '
3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Evan Charlton [Thu, 16 Oct 2014 05:51:41 +0000 (05:51 +0000)]
am
e8a700e9: am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
e8a700e9f7956333df647eebe5e8c9eb1ea8c12c':
Add WindowManager.aidl to AIDL list
RoboErik [Thu, 16 Oct 2014 05:51:37 +0000 (05:51 +0000)]
am
0dfd86e0: am
c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '
0dfd86e00656573cdd3e28742e93319c96f6ce15':
Don't call size on a null metadata
Geoff Mendal [Thu, 16 Oct 2014 01:43:50 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 01:40:57 +0000 (18:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I298dbca14148e723e574c299e6ee1d3aebd9b56c
Auto-generated-cl: translation import
Alan Viverette [Thu, 16 Oct 2014 01:07:03 +0000 (01:07 +0000)]
Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
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
Marco Nelissen [Thu, 16 Oct 2014 00:41:10 +0000 (00:41 +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:49 +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.
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
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
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
Quddus Chong [Wed, 15 Oct 2014 23:41:23 +0000 (23:41 +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:41:13 +0000 (23:41 +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:41:05 +0000 (23:41 +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:40:54 +0000 (23:40 +0000)]
am
5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '
5d460b88715c8a902eb3930e690ddd1b8d84338f':
Remove unnecessary logging.
Eric Rowe [Wed, 15 Oct 2014 23:40:40 +0000 (23:40 +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:40:11 +0000 (23:40 +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:40:07 +0000 (23:40 +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:39:57 +0000 (23:39 +0000)]
am
843e2343: Add WindowManager.aidl to AIDL list
* commit '
843e234318421b320e74bb2d09c3b436d82ee127':
Add WindowManager.aidl to AIDL list
RoboErik [Wed, 15 Oct 2014 23:39:29 +0000 (23:39 +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
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
Quddus Chong [Wed, 15 Oct 2014 23:26:41 +0000 (23:26 +0000)]
Merge "docs: Added L API overview." into lmp-dev
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
George Mount [Wed, 15 Oct 2014 23:21:51 +0000 (16:21 -0700)]
Use empty snapshots list when there are no shared elements.
Bug
17964119
Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
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
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
Geoff Mendal [Wed, 15 Oct 2014 22:38:38 +0000 (22:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-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
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
Dirk Dougherty [Sat, 11 Oct 2014 02:27:18 +0000 (19:27 -0700)]
Doc change: Add diffs for API level 21.
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
Geoff Mendal [Wed, 15 Oct 2014 22:01:59 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
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:59:09 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
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
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
Alan Viverette [Wed, 15 Oct 2014 21:16:41 +0000 (14:16 -0700)]
Set content description on CalendarView day labels
BUG:
17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
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
Jay Shrauner [Wed, 15 Oct 2014 19:59:18 +0000 (19:59 +0000)]
Merge "Remove unused onConferenceWith method" into lmp-mr1-dev
RoboErik [Wed, 15 Oct 2014 19:48:49 +0000 (19:48 +0000)]
Merge "Don't call size on a null metadata" into lmp-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
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
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
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
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.