drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,368 Commits 1 Branch 0 Tags
Commit Graph

155368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
d1a58c45fe am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
 2014-10-15 23:40:54 +00:00
Eric Rowe
de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-15 23:40:40 +00:00
Craig Mautner
87441860bf 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.
 2014-10-15 23:40:11 +00:00
John Spurlock
3d4aec1bb7 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).
 2014-10-15 23:40:07 +00:00
Evan Charlton
e8a700e9f7 am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '843e234318421b320e74bb2d09c3b436d82ee127':
  Add WindowManager.aidl to AIDL list
 2014-10-15 23:39:57 +00:00
RoboErik
0dfd86e006 am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
 2014-10-15 23:39:29 +00:00
xinhe
6bb21401a4 Sprint: MMS proxy authorization does not include NAI 
Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
 2014-10-15 16:31:19 -07:00
Quddus Chong
0a276b9448 Merge "docs: Added L API overview." into lmp-dev 2014-10-15 23:26:43 +00:00
Tom Taylor
8bda5cedb7 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
 2014-10-15 23:24:54 +00:00
Prashant Malani
1c542181e9 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.
 2014-10-15 23:24:50 +00:00
Ricardo Cervera
257507c4fa 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
 2014-10-15 23:24:46 +00:00
Luan Nguyen
295d5a76da 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
 2014-10-15 23:24:42 +00:00
smain@google.com
d7ce4f5653 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
 2014-10-15 23:24:38 +00:00
smain@google.com
235bc036bc 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
 2014-10-15 23:24:34 +00:00
Geoff Mendal
24d305b910 am 7b5d78f8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '7b5d78f89092852d7f7b2c73d73e2b769ec6dd35':
  Import translations. DO NOT MERGE
 2014-10-15 23:24:23 +00:00
George Mount
7c479f5a01 Use empty snapshots list when there are no shared elements. 
Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
 2014-10-15 16:21:51 -07:00
Tom Taylor
522fe28e3d 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
 2014-10-15 23:15:26 +00:00
Prashant Malani
0227cebcb2 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.
 2014-10-15 23:14:27 +00:00
Ricardo Cervera
e0cf20b505 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
 2014-10-15 23:14:24 +00:00
Luan Nguyen
faea1ffab2 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
 2014-10-15 23:14:17 +00:00
smain@google.com
fcebd6c320 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
 2014-10-15 23:14:12 +00:00
smain@google.com
24ff6491f1 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
 2014-10-15 23:14:07 +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
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE 
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
 2014-10-15 15:19:49 -07:00
Dirk Dougherty
6034230b29 Doc change: Add diffs for API level 21. 
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
 2014-10-15 15:06:50 -07:00
Geoff Mendal
512c2330c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-15 22:02:00 +00:00
Dirk Dougherty
963dca1a5d Doc change: Add diffs for l-preview -> API level 21. 
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
 2014-10-15 14:59:15 -07:00
Geoff Mendal
718ba70f6e Import translations. DO NOT MERGE 
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
 2014-10-15 14:59:09 -07:00
Geoff Mendal
e2a1f1cd88 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-15 21:52:24 +00:00
Craig Mautner
5d460b8871 Merge "Remove unnecessary logging." into lmp-dev 2014-10-15 21:48:52 +00:00
Geoff Mendal
89b5580b81 Import translations. DO NOT MERGE 
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
 2014-10-15 14:37:19 -07:00
Eric Rowe
1b4a728ac6 Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 2014-10-15 21:35:32 +00:00
Craig Mautner
3d7485c172 Remove unnecessary logging. 
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
 2014-10-15 14:30:02 -07:00
Alan Viverette
b70cfb9103 Merge "Avoid saveLayer in RippleDrawable if the background won't draw" into lmp-mr1-dev 2014-10-15 21:18:00 +00:00
Alan Viverette
ef71947fd3 Set content description on CalendarView day labels 
BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
 2014-10-15 14:16:41 -07:00
Craig Mautner
e52791055c Merge "Move desired task to top if not already there." into lmp-dev 2014-10-15 21:13:58 +00:00
Craig Mautner
737fae2b2e 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
 2014-10-15 14:11:23 -07:00
Eric Rowe
500f7583ed Add CHANGE_NETWORK_STATE permission to bt tests 
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
 2014-10-15 14:06:30 -07:00
John Spurlock
b2344c81bc Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 2014-10-15 21:04:33 +00:00
Evan Charlton
843e234318 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
 2014-10-15 13:26:32 -07:00
Quddus Chong
ccd80045a3 docs: Added L API overview. 
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
 2014-10-15 13:25:55 -07:00
Alan Viverette
67945c11a5 Update AM/PM selectors for clock face TimePicker 
The selectors are now CheckedTextViews, which makes more sense when
using a screen reader.

BUG: 17468036
Change-Id: I09c62a08172a710faa8fb7ed2bf99a66331e5701
 2014-10-15 13:20:54 -07:00
Jim Miller
3836c9a4c1 Fix getStorageEncryptionStatus() in DevicePolicyManager 
This fixes a bug introduced by a change where the function
ignores systems with default encryption where it's disabled.

The fix also checks to see if vold thinks the device is secure.

Fixes bug 17881324

Change-Id: I2c40f76cf990d90d1a825955aa3b080b21684426
 2014-10-15 13:15:52 -07:00
Jay Shrauner
9e18d7ab70 Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 2014-10-15 19:59:19 +00:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
Andrew Lee
4ef72f85e0 Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev 2014-10-15 19:29:57 +00: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