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

214285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 Albert
2edfa8c9b0 Merge "Make the appropriate cast to protect from mingw." 
am: dbf8c17bd2

* commit 'dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
  Make the appropriate cast to protect from mingw.
 2016-01-15 21:02:29 +00:00
Dan Albert
dbf8c17bd2 Merge "Make the appropriate cast to protect from mingw." 2016-01-15 20:41:23 +00:00
David Gross
26ef7a739b Add general reduction plumbing starting with Java Script::reduce(). 
Requires coordinated change in frameworks/rs.

Bug: 23535724
Change-Id: I2fee6750cf542948d8fa87a98441002c4d84f36e
 2016-01-15 12:20:08 -08:00
Dan Albert
ed811eeaea Make the appropriate cast to protect from mingw. 
As the comment at the top of the file says:

    STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
    value, so a cast is necessary.

Bug: http://b/26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
 2016-01-15 12:16:06 -08:00
Neil Fuller
f19a33a070 Merge "Add thread safety documentation" 
am: b3ea05a56e

* commit 'b3ea05a56ea980541d328ab7534a2da230d62c06':
  Add thread safety documentation
 2016-01-15 16:36:34 +00:00
Neil Fuller
69c2907c63 Merge "Fix @code escapes" 
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
 2016-01-15 16:31:40 +00:00
Neil Fuller
b3ea05a56e Merge "Add thread safety documentation" 2016-01-15 16:27:16 +00:00
Neil Fuller
2c9d40a06e Add thread safety documentation 
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.

Bug: 25767152
(cherry-picked from commit bf0dc0fba790cf95f76870c37469703f8f20a57c)

Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
 2016-01-15 16:26:26 +00:00
Neil Fuller
b0d92f4717 Merge "Fix @code escapes" 2016-01-15 16:22:16 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes 
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14958b80fe55738607740c6630e4e9da)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
 2016-01-15 16:14:57 +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
Neil Fuller
79ebcde07b Merge "Hide static setDefault methods in ICU4J" 
am: 9e892f53dd

* commit '9e892f53dd489c824b6a39c45028f838123daa85':
  Hide static setDefault methods in ICU4J
 2016-01-14 22:28:43 +00:00
Ian Pedowitz
7191a77585 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev am: 33001945a8 
am: 33b55366c5

* commit '33b55366c5138237e3da268a05f08b064426becc':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
 2016-01-14 22:26:32 +00: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
Neil Fuller
9e892f53dd Merge "Hide static setDefault methods in ICU4J" 2016-01-14 22:20:16 +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
c8ef3f8730 Don\'t verify the scrollbar drawable am: a53c3b2197 
am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable
 2016-01-14 21:49:09 +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
5cb336586e Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev am: e41a6c8b19 
am: 2363da89a4

* commit '2363da89a431d8809c49e4bb9568f63887e6e33e':
  Fix race condition when setting default ringtones
 2016-01-14 06:48:37 +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
2bb7707e00 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 
am: cd097ff856

* commit 'cd097ff856b800e3d6b991adfe2316007ddb9957':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
 2016-01-14 06:38:27 +00:00
Amit Mahajan
fa86813a56 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am: 658fdf8426 
am: 2b260b0006

* commit '2b260b0006403e6be39015c12e422f9782ce6877':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 06:34:46 +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
Amit Mahajan
2b260b0006 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 
am: 658fdf8426

* commit '658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 06:30:15 +00:00
Amit Mahajan
c6c9b2aa66 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev 2016-01-14 06:28:47 +00:00
Amit Mahajan
658fdf8426 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 2016-01-14 06:26:26 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d 
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:34:53 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:29:13 +00:00
Vinit Deshpande
1bbc082a47 Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] 
Bug: 24147407

Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
 2016-01-13 18:27:16 -08:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:24:48 +00:00
Chenjie Luo
4a577bff96 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 2016-01-14 02:22:15 +00:00
Amit Mahajan
7e8b8f1734 DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE 
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
 2016-01-14 01:59:55 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
 2016-01-14 01:26:05 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b 
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Nancy Zheng
b05f242bc8 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 am: f474056e99 
am: f4c56a21a3

* commit 'f4c56a21a389e70b472e4e7e586c7cf59a444f8e':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:23:20 +00:00
Nancy Zheng
f4c56a21a3 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 
am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:12:14 +00:00
Nancy Zheng
f474056e99 Pulling in https://android-review.googlesource.com/#/c/186482/1 
am: 74dfcf90f1

* commit '74dfcf90f18d8d0e1128707a5986c4fa94d70350':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-13 23:59:42 +00:00
Nancy Zheng
74dfcf90f1 Pulling in https://android-review.googlesource.com/#/c/186482/1 
Fix memory leak in HWUI

std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Bug: 26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
 2016-01-13 15:23:56 -08:00
Selim Cinek
a8a4d29aec Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd 
am: 804ff964af

* commit '804ff964afed8154c5b169cd1f2bb6e89dc05f2f':
  Fixed a crash with the heads up manager
 2016-01-13 23:14:26 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f 
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:10:29 +00:00
Selim Cinek
804ff964af Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 
am: d23f1eb0cd

* commit 'd23f1eb0cd9893395573a4059be195e8fdb1007a':
  Fixed a crash with the heads up manager
 2016-01-13 23:10:20 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:01:29 +00:00
Selim Cinek
d23f1eb0cd Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 2016-01-13 23:01:13 +00:00