Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,567 Commits 3 Branches 0 Tags
4fe8ff316645a3f5ce163cd41d1c6e94de0c1fdf
Commit Graph

48520 Commits

Author SHA1 Message Date
Glenn Kasten
4fe8ff3166 Remove constructor 
Change-Id: Ie2c29a92a2fd7c546e314a610a2e8c2506f18511
 2014-12-10 15:40:34 -08:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
John Reck
af878b91f9 am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
  Fix issue with RNA destruction mid-animation
 2014-12-09 23:49:22 +00:00
Adrian Roos
c3c22399bc am 4816e1c5: am a7065ea3: am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit '4816e1c51922b10a2fea9087c858aff4a117d89b':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 23:48:26 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 23:47:19 +00:00
Elliott Hughes
de472a53ac am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo." 
* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
  Fix typo.
 2014-12-09 23:46:44 +00:00
Sebastien Hertz
dde13b3714 am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 23:23:36 +00:00
Mathieu Chartier
5311088a3e am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
  Add more -d dalvik details to dumpsys
 2014-12-09 23:22:38 +00:00
Alan Viverette
48614536a7 am 2bbf5575: am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev 
* commit '2bbf5575e71f414d7ad8333d5daeef13ace04cfa':
  Fix auto-advance regression in radial time picker
 2014-12-09 23:21:43 +00:00
Ruben Brunk
28089cc39b Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:20:39 +00:00
Jeff Sharkey
dc460d3512 am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev 
* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
  Direct notification of network interface changes.
 2014-12-09 23:20:26 +00:00
Alan Viverette
8249a61c66 am f758af4e: am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev 
* commit 'f758af4e72db1055bae180b3ac92a8194b8653fd':
  Let host view handle long-press when using drag-to-open
 2014-12-09 23:20:11 +00:00
Alan Viverette
72098499af am b0efde16: am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev 
* commit 'b0efde16ea2418e63e535aa186b5df1352209d1a':
  Fix regression, don't NPE if Switch doesn't have a thumb set
 2014-12-09 23:20:07 +00:00
Svet Ganov
70acef7df4 am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev 
* commit 'aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69':
  When accessibility on cannot click on a view covered by a HorizontalScrollView
 2014-12-09 23:20:02 +00:00
Svet Ganov
0213ac7cda am 2dbd133c: am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev 
* commit '2dbd133c966a3b1acc51a9b645622667830c7e3e':
  Clear clicked nodes from the accessibiliy cache.
 2014-12-09 23:19:58 +00:00
Ruben Brunk
6d9826546d Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 
automerge: 3ef5033

* commit '3ef5033cdacbc44702d0b6ba687e81383348e2fd':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:13:06 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
Alan Viverette
d3a0da9aac am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 
* commit '5a50a8bcabdb2593b48b06854a7455318399b6d1':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
 2014-12-09 22:23:37 +00:00
Jeff Sharkey
a9f6048a94 am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
  Offer to "merge" subscribers for data usage.
 2014-12-09 22:23:19 +00:00
John Spurlock
089c6d79e3 am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit 'ef10307e4a4942c5867ba696e12e13556ac7a716':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-09 22:23:04 +00:00
John Reck
389baa3951 am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
  Fix issue with RNA destruction mid-animation
 2014-12-09 22:18:27 +00:00
Elliott Hughes
a04cd35da0 am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
  Fix typo.
 2014-12-09 22:09:25 +00:00
John Reck
7d74cb6c61 am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '14c436897ca56800a3758008f0631c559a898967':
  Fix issue with RNA destruction mid-animation
 2014-12-09 22:08:42 +00:00
Elliott Hughes
0aac16bbf1 am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
  Fix typo.
 2014-12-09 21:34:06 +00:00
John Reck
14c436897c Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 2014-12-09 20:37:17 +00:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation 
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
 2014-12-09 12:35:12 -08:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. 
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
 2014-12-09 11:56:22 -08:00
Elliott Hughes
b034de7eef am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.
 2014-12-09 19:30:26 +00:00
Elliott Hughes
12f100def9 am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
  Fix typo.
 2014-12-09 19:22:33 +00:00
Adrian Roos
4816e1c519 am a7065ea3: am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit 'a7065ea363bd2bcebd31cccf114f36c8f578a22b':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 18:59:29 +00:00
Adrian Roos
a7065ea363 am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit 'c3642ef5c8582193f26b3875cebd902253709d5e':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 18:52:13 +00:00
Adrian Roos
c3642ef5c8 Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 2014-12-09 18:44:31 +00:00
Adrian Roos
2ae3805efb Revert "Add overscan insets to surface frame dimensions in WallpaperService." 
This reverts commit a2838dfc2c.

Bug: 18630625
Bug: 18659737
Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
 2014-12-09 18:32:07 +00:00
Elliott Hughes
547b0acae1 Fix typo. 
Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
 2014-12-09 10:31:37 -08:00
Wink Saville
7a4df2b7d8 am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 18:06:03 +00:00
Wink Saville
2f5cb84355 am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '15b29ac7faf3b8b7845e6623f68ae7a7391dab78':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 17:58:37 +00:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Elliott Hughes
d50a5e7486 am afc5b22c: am da30b545: Merge "Fix typo." 
* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
  Fix typo.
 2014-12-09 16:17:34 +00:00
Elliott Hughes
da30b545f9 Merge "Fix typo." 2014-12-09 16:02:57 +00:00
Przemyslaw Szczepaniak
4b73867a12 Add UtteranceProgressListener#onStop callback 
New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84
 2014-12-09 11:06:06 +00:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01:00
Elliott Hughes
0adcf15ad8 Fix typo. 
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
 2014-12-08 20:50:00 -08:00
Mike Lockwood
ae13230b87 Merge "MIDI: API changes to support multiple ports per device" 2014-12-09 02:37:40 +00:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57 am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:43:00 +00:00
Mathieu Chartier
063028aa68 Add more -d dalvik details to dumpsys 
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d)
 2014-12-08 17:33:56 -08:00
Mathieu Chartier
4ec1bdf52f am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:31:11 +00:00