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

206707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
08d7e9608e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours 
am: 5cb2597a9d

* commit '5cb2597a9da3202229fdbc91c12b8e172b2b5667':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:01:02 +00:00
Matthew Williams
5cb2597a9d DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 
am: 1f6dbd910b  -s ours

* commit '1f6dbd910bf9bf93df8a708209e92add61fbff44':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:54:44 +00:00
Matthew Williams
1f6dbd910b DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:48:55 +00:00
Matthew Williams
9e52b29fe2 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours 
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:41:55 +00:00
Matthew Williams
a76208d4e4 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a 
am: 9c841923df  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:37:01 +00:00
Matthew Williams
9c841923df DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours 
am: 0d3e46391a

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:29:33 +00:00
Matthew Williams
0d3e46391a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 
am: 5fc753acaf  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:19:53 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs 
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-21 14:15:11 +00:00
Jorim Jaggi
7a1c656269 Fix SystemUI animator leak 
am: 3c988197fa

* commit '3c988197fac989e4cca7fd1a96f6489e8ed4a05b':
  Fix SystemUI animator leak
 2016-01-21 05:34:13 +00:00
Jorim Jaggi
3c988197fa Fix SystemUI animator leak 
When there was a state change or layout when there was an animation
set as the mobile icon in the status bar, we never stopped the old
animation, which was infinite. This was using more and more CPU because
the animations never got stopped.

To fix this, we don't update the drawable when a layout happens and we
stop the previous animation when replacing the icon.

Bug: 26616870
Change-Id: If501155d1a99d587e50a1b77ebb03a21c940662b
 2016-01-21 01:59:27 +00:00
Chenjie Luo
bf9a587ca8 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev am: b2b2fb0182 
am: 8d6f1956e4

* commit '8d6f1956e46cefed0eaa754a468805e2e4d61972':
  Fix bug in AssetAtlas packing loop
 2016-01-21 00:11:23 +00:00
Chenjie Luo
8d6f1956e4 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev 
am: b2b2fb0182

* commit 'b2b2fb018243831144929b1db9db9b8eeab8d984':
  Fix bug in AssetAtlas packing loop
 2016-01-20 23:55:34 +00:00
Chenjie Luo
b2b2fb0182 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev 2016-01-20 23:38:46 +00:00
Chenjie Luo
e66554d4be Fix bug in AssetAtlas packing loop 
There is a bug in AssetAtlasService that it always choose the
MAX_SIZE as height. The for loop of height calculation starts
from MAX_SIZE and breaks when it finds a working texture. This
means the height loop will always break for the initial value.
Reording the loop optimize the algorithm to find a smaller
atlas texture. The MIN_SIZE is also changed to 512 for fewer
assets case.

Bug: 26429912
Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
 2016-01-20 14:35:29 -08:00
Matthew Williams
4cc10825f0 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a am: 85f169d19f 
am: c77a2228aa

* commit 'c77a2228aa66a1d2b1e497c193604de0717ec3c7':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:38:50 +00:00
Matthew Williams
c77a2228aa Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a 
am: 85f169d19f

* commit '85f169d19f200daa35a30652905d6daf090955c6':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:31:19 +00:00
Matthew Williams
85f169d19f Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 
am: ce3842eb1a

* commit 'ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:08:33 +00:00
Geoff Mendal
79b3e943ca Import translations. DO NOT MERGE 
am: a341d639a7  -s ours

* commit 'a341d639a7d093fb36850956cd9b3738b72ecfc2':
  Import translations. DO NOT MERGE
 2016-01-20 17:42:58 +00:00
Geoff Mendal
ce64efc199 Import translations. DO NOT MERGE 
Change-Id: I3902d341ef58ad3b1d0da111d06384eb60c795ce
Auto-generated-cl: translation import
 2016-01-20 10:12:24 -05:00
Geoff Mendal
a341d639a7 Import translations. DO NOT MERGE 
Change-Id: I875bc3fe8f82fe0b29867e9d4790b2e57c4df566
Auto-generated-cl: translation import
 2016-01-20 09:33:02 -05:00
Matthew Williams
ce3842eb1a Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c 
am: 0f292147f3

* commit '0f292147f3ac803a8701afd7362ad3e0487fd496':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:55:52 +00:00
Matthew Williams
0f292147f3 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e 
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-20 00:02:58 +00:00
Doris Liu
22116275aa Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev 
am: a466e15223

* commit 'a466e15223ad64c5ae5d81e51f571fc45f606920':
  Revert "Get animation update timing for AVD"
 2016-01-19 20:04:36 +00:00
Doris Liu
a466e15223 Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev 2016-01-19 19:59:53 +00:00
Doris Liu
476b686d67 Revert "Get animation update timing for AVD" 
This reverts commit fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.

Bug: 26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
 2016-01-19 19:56:13 +00:00
Geoff Mendal
7819c3b859 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-01-18 15:23:52 +00:00
Geoff Mendal
6cf2918464 Import translations. DO NOT MERGE 
Change-Id: I581155468832227ff209fc60743a2735b34f91a2
Auto-generated-cl: translation import
 2016-01-18 10:19:19 -05:00
Geoff Mendal
0745fe8db2 Import translations. DO NOT MERGE 
am: 6168c078ae  -s ours

* commit '6168c078aebc9cc3a371fb1165681c3b40e1b2f0':
  Import translations. DO NOT MERGE
 2016-01-18 14:47:10 +00:00
Geoff Mendal
6168c078ae Import translations. DO NOT MERGE 
Change-Id: I0ff7336ca90107f45266090de0ffc634daa54722
Auto-generated-cl: translation import
 2016-01-18 09:41:08 -05:00
Thierry Strudel
f4dd31755a Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev 
am: fc7e682f44

* commit 'fc7e682f445fbf358e59205912229b63c5fadda4':
  Supply content description for QS disconnect buttons
 2016-01-15 23:47:53 +00:00
Thierry Strudel
fc7e682f44 Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev 2016-01-15 23:44:45 +00:00
Daniel Sandler
3be84505f4 Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev 
am: 76f28bbd64

* commit '76f28bbd64a6841a91d4890d7a248411fd95b149':
  Stop leaking Notifications when they change groupKeys.
 2016-01-15 21:14:01 +00:00
Daniel Sandler
76f28bbd64 Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev 2016-01-15 21:05:41 +00:00
Dan Sandler
24813b0dd5 Stop leaking Notifications when they change groupKeys. 
If a Notification changes groups (either from one group to
another, or gets a group key for the first time, which takes
it out of its implicit singleton group) it should be removed
from the old group in NotificationGroupManager's mGroupMap
and re-inserted under the new one.

Unfortunately we were passing the *new* notification in the
oldNotification argument, so we would always attempt (and
fail) to remove it from the *new* group, leaving a strong
reference to the Notification inside mGroupMap under an
obsolete group key.

Bug: 26561365
Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
 2016-01-15 10:29:31 -05:00
Ian Pedowitz
33b55366c5 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev 
am: 33001945a8

* commit '33001945a82ba8cd5b5ad27b808312aa2ef210af':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
 2016-01-14 22:21:37 +00:00
Ian Pedowitz
33001945a8 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev 2016-01-14 22:18:32 +00:00
Alan Viverette
ca6b87fea6 Don\'t verify the scrollbar drawable 
am: a53c3b2197

* commit 'a53c3b2197b73d5b6a697ae2077e04065df84d9e':
  Don't verify the scrollbar drawable
 2016-01-14 21:44:31 +00:00
Alan Viverette
a53c3b2197 Don't verify the scrollbar drawable 
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
 2016-01-14 21:07:13 +00:00
Dan Sandler
b3f1109d99 Supply content description for QS disconnect buttons 
Bug: 26555270
Change-Id: I3803c7ad78a64894eca5c36f5d9ecf7fc4a6ad92
 2016-01-14 11:38:35 -05:00
Shreyas Basarge
7aa4671b36 DO NOT MERGE Fix for syncs being dropped when appIdle is on 
Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.

Bug: 26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
 2016-01-14 16:24:00 +00:00
Justin Harrison
2363da89a4 Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev 
am: e41a6c8b19

* commit 'e41a6c8b19482a05a98e77d13281f7f14056f119':
  Fix race condition when setting default ringtones
 2016-01-14 06:44:21 +00:00
Justin Harrison
e41a6c8b19 Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev 2016-01-14 06:42:20 +00:00
Amit Mahajan
cd097ff856 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev 
am: c6c9b2aa66

* commit 'c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
 2016-01-14 06:33:00 +00:00