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

188084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
004a170458 Merge "Remove deprecated fields in AbstractCursor." 2015-04-10 02:49:36 +00:00
Jeff Brown
4e0951ef7a Expose Cursor.setExtras(). 
Bug: 19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80
 2015-04-09 19:48:11 -07:00
Jeff Brown
8faab36fdd Clean up AbstractCursor API. 
Deprecated three protected fields that should not have been
exposed in the API.

Bug: 6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557
 2015-04-09 19:48:10 -07:00
Jeff Brown
4670513e70 Remove deprecated fields in AbstractCursor. 
Bug: 6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe
 2015-04-09 19:48:10 -07:00
Chong Zhang
0bb34ca325 Merge "MediaMetadataRetriever: add key for capture fps" 2015-04-10 02:29:38 +00:00
John Spurlock
11145938bb Merge "Volume: Update media bluetooth icons." 2015-04-10 02:07:52 +00:00
John Spurlock
f15ef112e7 Volume: Update media bluetooth icons. 
Note + bt logo.

Bug: 19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94
 2015-04-09 22:06:10 -04:00
John Spurlock
ec88e8956c Merge "An update on Downtime." 2015-04-10 01:48:06 +00:00
John Spurlock
b2278d6571 An update on Downtime. 
The update is that Downtime is obsolete.  Replaced by the
ability to define multiple named schedule calendars.

 - Make changes to ZenModeConfig to properly model manual
   and automatic rules.
 - Refactor the zen mode helper (and supporting classes) to
   properly handle / report multiple claims on zen mode.
   The "manual" rule (specified by the user in the UI) vs
   one or more automatic rules.
 - Automatic rules are still backed by condition providers,
   but the layering is now cleaner.  ConditionProviders is now
   completely generic, has no ties to zen mode.
 - Specifically, the new layering for zen mode (below noman) is:
   ZenModeHelper: Source of truth for zen state
     ZenModeFiltering: Subhelper dedicated to filtering rules.
     ZenModeConditions: Subhelper dedicated to managing automatic rules.
       ConditionProviders:  Underlying engine for reporting named boolean state.
 - Migration story for users with existing downtime config, migrated
   to a single new calendar named downtime.
 - For users with no existing downtime, two default calendars are created
   for weeknights + weekends (icu4j for all locales will be done in a followup).
 - Remove obsolete DowntimeConditionProvider/NextAlarmConditionProvider and tracking.
 - Clean up obsolete resources.
 - Add common zen summary description string computation.
 - Add proper noman wrappers for the new model.
 - Change the semantics of the global zen setting.  It is now read-only.  Setters
   must call noman, added a "reason" to all calls for better attribution.
 - Update zenmodepanel + volumedialog to the new model.
 - Display the one or more automatic rules in the new zen footer summary.
 - "Snooze" the automatic rules when the user explicitly turns zen off.

Bug: 20064962
Change-Id: Idd9deb865a6035ad0cfae660198dccb517e6d7cc
 2015-04-09 21:45:08 -04:00
Tim Murray
72fcf9eb10 am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory." 
* commit 'af61d43d6ce065832f906757c2185c3dad74d489':
  Add support for setting the cache directory.
 2015-04-10 01:30:14 +00:00
Nancy Chen
a3117b3881 Create interface for SmsManager text sending methods. 
This is part of set of changes to make looser changes just internally to
send SMS from packages/services/Telephony.

Bug: 19236241
Change-Id: I207ab73b2f63f745a55cefd12c85a044f7bbf11d
 2015-04-09 18:21:41 -07:00
Tim Murray
af61d43d6c am 6d718c2f: Merge "Add support for setting the cache directory." 
* commit '6d718c2f43f6be057f9a519bc02f6b123405b79d':
  Add support for setting the cache directory.
 2015-04-10 01:07:26 +00:00
Tim Murray
6d718c2f43 Merge "Add support for setting the cache directory." 2015-04-10 00:51:15 +00:00
Tim Murray
47f31582b6 Add support for setting the cache directory. 
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
 2015-04-09 17:50:39 -07:00
Alex Klyubin
037dfb9423 am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes." 
* commit '5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
  Track recent keymaster_defs.h changes.
 2015-04-10 00:35:55 +00:00
Adam Lesinski
a826c4b7a4 Merge "Add PNG and 9-patch support" 2015-04-10 00:32:28 +00:00
Alan Viverette
9eaa604116 Don't change state when inflating LayerDrawable 
Bug: 20098214
Change-Id: I6968697053587454bba42c0652efd99b9c8a8e25
 2015-04-09 17:28:24 -07:00
Alex Klyubin
5f8c17b9f6 am ba2836e6: Merge "Track recent keymaster_defs.h changes." 
* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.
 2015-04-10 00:22:45 +00:00
Adam Lesinski
98aa3ad6e4 Add PNG and 9-patch support 
Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2
 2015-04-09 17:19:06 -07:00
Alex Klyubin
04a99c7b44 am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." 
* commit '82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5':
  Split key origin into TEE/not and generated/imported.
 2015-04-10 00:06:25 +00:00
Alex Klyubin
ba2836e6cf Merge "Track recent keymaster_defs.h changes." 2015-04-10 00:01:19 +00:00
Alex Klyubin
862e6c7814 Track recent keymaster_defs.h changes. 
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
 2015-04-09 16:58:58 -07:00
Alex Klyubin
82cba6aa37 am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." 
* commit 'c6eb62882b09cf06e1e70c14e7878593d1a76477':
  Split key origin into TEE/not and generated/imported.
 2015-04-09 23:55:47 +00:00
Alan Viverette
0680bcd1f9 Merge "Avoid double-apply of dialog theme" 2015-04-09 23:52:41 +00:00
Mathieu Chartier
6951d555c2 am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 
* commit '56a6d371bd4978bb7dfa7cce8bfbcc0bb13abd93':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
 2015-04-09 23:47:20 +00:00
Mathieu Chartier
56a6d371bd am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 
* commit 'da164973f35aa32e44d0b9336deef28df5b13544':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
 2015-04-09 23:36:06 +00:00
Alex Klyubin
c6eb62882b Merge "Split key origin into TEE/not and generated/imported." 2015-04-09 23:34:45 +00:00
Fabrice Di Meglio
5f76360ff9 Merge "Add IntentFilter auto verification - part 5" 2015-04-09 23:23:38 +00:00
Fabrice Di Meglio
e48c137acd Add IntentFilter auto verification - part 5 
- optimize IntentFilter verification: dont do stuff we dont want
if we dont need to do them.

- improve IntentFilter candidates filtering and also improve
at the same time fix for bug #20128771: we can return the candidates
list rigth the way if the Intent is not related to a Web data URI and
include the "undefined verification state" ones if the first filtering
pass does not leave any.

Change-Id: I19f5c060f58b93530e37b4425d19ed23d2a0f4c0
 2015-04-09 16:19:44 -07:00
Mathieu Chartier
da164973f3 Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 2015-04-09 23:14:28 +00:00
Mathieu Chartier
537691fc2d Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category" 
Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507

(cherry picked from commit 546edc5a31bb5a843048e11d8afb0b1f6441ddb4)

Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e
 2015-04-09 15:53:17 -07:00
Alex Klyubin
b503c52f07 Split key origin into TEE/not and generated/imported. 
This is to match the upcoming changes in Keymaster HAL API.

Bug: 18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
 2015-04-09 15:50:17 -07:00
Mathieu Chartier
b47ba1e7d5 Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 2015-04-09 22:48:53 +00:00
Jeff Tinker
74797f843c Add expiration update and keys change events 
In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
 2015-04-09 22:44:36 +00:00
Dianne Hackborn
24f683523e Merge "More work on device idle mode and other power stuff." 2015-04-09 22:35:36 +00:00
George Mount
4dc668cd36 Revert "Revert "Allow delay of showing/hiding shared element when transferring."" 
This reverts commit 44d15f1c2e8f07ae9a88d79721547cf8e5935b6c.

Fix doc comment errors.

Change-Id: Ieeb07b907f0c66a133ef57136c45c504bcc04694
 2015-04-09 15:31:38 -07:00
Ronghua Wu
564eb45b00 Merge "media: add new MediaCodec Callback onCodecReleased." 2015-04-09 22:29:14 +00:00
Jeff Sharkey
95f534143d am 84debe27: am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd." 
* commit '84debe2761433cfaa8203d5a2defa4ba2ed64b61':
  Start passing volume UUID to installd.
 2015-04-09 22:21:50 +00:00
Alex Klyubin
43de2a9b52 am 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 
* commit '4acc3392c35e5ad98c8e7b650b1368a2956746b7':
  Fix minor issues in new Javadocs of AndroidKeyStore.
 2015-04-09 22:21:41 +00:00
Yohei Yukaw
fba00864f8 Merge "Verify that EditorInfo.packageName and uid are consistent" 2015-04-09 22:10:48 +00:00
Jeff Sharkey
84debe2761 am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd." 
* commit 'e000118549c10deaf17c27a14efa866184127b6d':
  Start passing volume UUID to installd.
 2015-04-09 22:07:29 +00:00
Alex Klyubin
4acc3392c3 am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 
* commit '8676a88e60ed342cfb5c576aef80960976e3c396':
  Fix minor issues in new Javadocs of AndroidKeyStore.
 2015-04-09 22:07:18 +00:00
Jeff Sharkey
e000118549 am 1d3c77a2: Merge "Start passing volume UUID to installd." 
* commit '1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
  Start passing volume UUID to installd.
 2015-04-09 21:57:41 +00:00
Alex Klyubin
8676a88e60 am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 
* commit '97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
  Fix minor issues in new Javadocs of AndroidKeyStore.
 2015-04-09 21:57:35 +00:00
Ronghua Wu
4c302e8b14 media: add new MediaCodec Callback onCodecReleased. 
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
 2015-04-09 14:47:58 -07:00
Jeff Sharkey
1d3c77a21e Merge "Start passing volume UUID to installd." 2015-04-09 21:41:12 +00:00
Alex Klyubin
97d2d7c427 Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 2015-04-09 21:41:00 +00:00
Mathieu Chartier
546edc5a31 Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category" 
Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507
Change-Id: Idd3e5560f376157c32094a5fbb84e8b6be4b2843
 2015-04-09 14:39:00 -07:00
Alex Klyubin
7882a7fcd4 Fix minor issues in new Javadocs of AndroidKeyStore. 
Bug: 18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
 2015-04-09 14:33:11 -07:00
Clara Bayarri
32b7f9fbcc Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection" 2015-04-09 21:31:51 +00:00