Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
319,316 Commits 3 Branches 0 Tags
5deb5277f50dd61acfb302eef31100a002c6e0dc
Commit Graph

319316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
5deb5277f5 Merge "Merge "Set the decay timer for all forked apps." am: 232ce7868d am: 241fb2fc53 am: 50ee43bbfa" into oc-dev-plus-aosp 2017-05-16 14:29:13 +00:00
Christopher Ferris
dc433b78e6 Merge "Set the decay timer for all forked apps." am: 232ce7868d am: 241fb2fc53 
am: 50ee43bbfa

Change-Id: I407053978d2467f9275a29a9e47e8d41c6343aff
 2017-05-16 14:28:00 +00:00
Svet Ganov
c4996bd89c Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev 
am: 2df0155a97

Change-Id: I6cb947b8c42298c7cff1932031faec362b99a354
 2017-05-16 14:26:00 +00:00
Christopher Ferris
50ee43bbfa Merge "Set the decay timer for all forked apps." am: 232ce7868d 
am: 241fb2fc53

Change-Id: I1e27ac03777f99cc3e71935fcdfb7ea10d5bfbf4
 2017-05-16 14:18:57 +00:00
TreeHugger Robot
2df0155a97 Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev 2017-05-16 14:16:01 +00:00
Christopher Ferris
241fb2fc53 Merge "Set the decay timer for all forked apps." 
am: 232ce7868d

Change-Id: Ia6e16a2f6b8e551a48d6f3ab4472d097284436f4
 2017-05-16 14:10:18 +00:00
Christopher Ferris
232ce7868d Merge "Set the decay timer for all forked apps." 2017-05-16 14:02:53 +00:00
Hugo Benichi
36d913c7b9 Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 am: fe098f8207 
am: e13c192d0f

Change-Id: Ib8368c5a8538914cba2723368c03618401ac159f
 2017-05-16 13:25:09 +00:00
Hugo Benichi
e13c192d0f Merge "Remove unused import in ConnectivityManager" am: db6fc1afe8 
am: fe098f8207

Change-Id: I64a2a607769d7194161e7728465c38cabbfa9345
 2017-05-16 13:18:33 +00:00
Hugo Benichi
fe098f8207 Merge "Remove unused import in ConnectivityManager" 
am: db6fc1afe8

Change-Id: I1a7ce964c66e0204bfcc69948f7bed23ab498c81
 2017-05-16 13:11:58 +00:00
Treehugger Robot
db6fc1afe8 Merge "Remove unused import in ConnectivityManager" 2017-05-16 13:04:37 +00:00
Erik Kline
80284de16b Fix broken DUN evaluation logic 
am: 5afccc6251  -s ours

Change-Id: I72aaa6c86fa9cda9625334e8989dcc540867bdea
 2017-05-16 10:36:13 +00:00
Erik Kline
5afccc6251 Fix broken DUN evaluation logic 
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
Bug: 32163131
Bug: 38152109
Bug: 38186915
Merged-In: Ib9a469b16a598c47b615a15fc7cce420bfe4b8b7
Merged-In: I293b4cd57dcd1968c2b38f4e92e24cc0d2e135a9
Change-Id: Id4803504e825290d62c0b51a2b9bd664dcef30b1
(cherry picked from commit 54f2f3704e)
 2017-05-16 17:31:14 +09:00
Erik Kline
260fa1dd9e Merge "Fix broken DUN evaluation logic" am: b0daeeb879 am: dd76dd1eea 
am: 5d1bcf5bca

Change-Id: Ib9a469b16a598c47b615a15fc7cce420bfe4b8b7
 2017-05-16 08:19:22 +00:00
Erik Kline
5d1bcf5bca Merge "Fix broken DUN evaluation logic" am: b0daeeb879 
am: dd76dd1eea

Change-Id: I7e194d1c17df7770706e3c80e587ce296f1e40f8
 2017-05-16 08:13:14 +00:00
Erik Kline
dd76dd1eea Merge "Fix broken DUN evaluation logic" 
am: b0daeeb879

Change-Id: Iae7450ef21485c5a13f45fab570bf658b2da8f28
 2017-05-16 08:06:42 +00:00
Treehugger Robot
b0daeeb879 Merge "Fix broken DUN evaluation logic" 2017-05-16 07:58:02 +00:00
Svet Ganov
0df3702f53 Fixes crash (race cond) when using toast that is immediately cancelled 
Running cancel after toast is shown and adding some UI stress (or sleep
on UI thread) causes a crash from toast when trying to add the toast
window to the display. The toast must be triggered from app that is
above N MR1 (25).

The steps that crash the app are:
1. Show toast (Toast.makeText(...).show()), window token is created
2. Immediately cancel toast (Toast.cancel()), window token is removed
3. Stall UI thread (Thread.sleep, heavy task), both show and cancel
events are queued to UI thread from window manager
4. Crash trying to add toast but no window token exists

In Toast:handleShow(), the mNextView is required to add the toast to
display, if the mNextView is null before posting to window manager, then
when handleShow() runs later, it will ignore adding the toast to
display. The issue before is that mNextView is set to null after cancel
runs back from window manager in UI thread but the show post will always
happen first. Therefore set mNextView to null at the beginning of
cancel will ignore adding the toast to display and avoid the crash.

Bug: 37606432

Test: manual - write an app to Toast.show(), Toast.cancel(), then
Thread.sleep(), set app's sdk usage above 25 (N MR1) and show the
toast

Change-Id: I352e296c47b1b8776c78b6b0943b1dc809963026
 2017-05-15 23:46:21 -07:00
Sungsoo
15cbcc866b Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev 
am: 69c81d8cef

Change-Id: I807ee9c4357876d691d3791815f14265984cea6b
 2017-05-16 06:37:19 +00:00
TreeHugger Robot
69c81d8cef Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev 2017-05-16 06:28:09 +00:00
Erik Kline
54f2f3704e Fix broken DUN evaluation logic 
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
Bug: 32163131
Bug: 38152109
Bug: 38186915
Change-Id: Id4803504e825290d62c0b51a2b9bd664dcef30b1
 2017-05-16 15:14:45 +09:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev 
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
 2017-05-16 04:02:51 +00:00
Ian Pedowitz
9ebb128c40 Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 
am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0
 2017-05-16 04:00:05 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Ian Pedowitz
a11196074b Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 2017-05-16 03:32:33 +00:00
Hugo Benichi
d5ad3e8a0c Remove unused import in ConnectivityManager 
This makes the pre-upload verification pass.

Test: no functional change.
Change-Id: I6beccea10ccfcb39d975cb8f6f34fc9d79f1e170
 2017-05-16 11:39:08 +09:00
Kirill Grouchnikov
82f46bcd19 Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev 
am: 7e08c7ec17

Change-Id: I542f50f407964b30b0016400bb88348671a5c550
 2017-05-16 01:52:49 +00:00
Kirill Grouchnikov
7e08c7ec17 Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev 2017-05-16 01:43:33 +00:00
Kirill Grouchnikov
8a06040d80 Revert "Tweak test app makefile with extra resources" 
This reverts commit f0435e1839.

Bug: 30240339
Change-Id: I6cc03188d5666eded5869c583db76e02b6f90794
 2017-05-16 01:34:15 +00:00
Aurimas Liutikas
3ff9b30724 Merge "Update TimePicker mode switch icon." into oc-dev 
am: 1812e446e1

Change-Id: I8289ec34bef3f03a0fac671208e7257b547e49e1
 2017-05-16 01:19:47 +00:00
TreeHugger Robot
1812e446e1 Merge "Update TimePicker mode switch icon." into oc-dev 2017-05-16 01:14:01 +00:00
Svet Ganov
8adfc2cac7 Merge "Support recursive static shared lib dependency" into oc-dev 
am: e04765998e

Change-Id: I674191296c7d0a409e19614b2f18a4b86bf03ab8
 2017-05-16 00:03:00 +00:00
Christopher Ferris
ab16dd10f1 Set the decay timer for all forked apps. 
This will cause native memory frees to be less expensive, but it will cost
a bit of PSS that might hang around.

Bug: 36401135

Test: Built and booted bullhead.
Test: Ran jemalloc unit tests.
Test: Ran bionic unit tests.
Test: Ran a test that allocated and free'd a large piece of memory,
Test: and verified that after changing the parameter, the PSS
Test: sticks around (decay timer set to 1), the PSS is purged (decay
Test: timer set to 0).
Change-Id: I140b26986f3f81fddd5b9ed9c9e4f2d4977b819b
 2017-05-15 16:50:29 -07:00
TreeHugger Robot
e04765998e Merge "Support recursive static shared lib dependency" into oc-dev 2017-05-15 23:49:07 +00:00
Rob Carr
dff4323f01 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4
 2017-05-15 23:38:21 +00:00
Kirill Grouchnikov
0eeaa4643c Merge "Tweak test app makefile with extra resources" into oc-dev 
am: 2b1df4ec14

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18
 2017-05-15 23:26:16 +00:00
Rob Carr
f5b6818009 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 2017-05-15 23:17:33 +00:00
Jesse Hall
4e99819ba6 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 
am: 40b274915e

Change-Id: I849c6a942448536b67d79f0687f07ed36567fa1b
 2017-05-15 23:15:04 +00:00
Kirill Grouchnikov
2b1df4ec14 Merge "Tweak test app makefile with extra resources" into oc-dev 2017-05-15 23:11:09 +00:00
TreeHugger Robot
40b274915e Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 2017-05-15 23:02:05 +00:00
Aurimas Liutikas
c0aa90d9ee Update TimePicker mode switch icon. 
Previously the icon was an event icon, but a clock icon is
more appropriate so we are switching to that instead.

Bug: 37351390
Test: Open time picker
Change-Id: I47e6caf3c341c10264168004628288fd00e4601a
 2017-05-15 15:39:28 -07:00
Android Build Merger (Role)
74714d0323 Merge "Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp 2017-05-15 22:38:33 +00:00
Hall Liu
deeda1e353 Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 
am: 7e80c3f00b

Change-Id: Id3359056c247288825ec672963b538cfaa121937
 2017-05-15 22:35:04 +00:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev 
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
 2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Hall Liu
7e80c3f00b Merge "Change signalStrength to int." am: 73818566d6 
am: 762e0c1162

Change-Id: I5cf3c07071c57c362847133c8858227d58662ce8
 2017-05-15 22:25:34 +00:00
Hall Liu
762e0c1162 Merge "Change signalStrength to int." 
am: 73818566d6

Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f
 2017-05-15 22:14:59 +00:00
Hall Liu
73818566d6 Merge "Change signalStrength to int." 2017-05-15 22:01:21 +00:00
Svet Ganov
58c99f0207 Support recursive static shared lib dependency 
Test: Updated the static shared lib CTS tests to verify that
      All static shared lib CTS tests pass

bug:35359862

Change-Id: Id4a0dabbc9d8e98962e92b6f537f6ffffa63b585
 2017-05-15 14:43:17 -07:00
Dmitry Dementyev
41b5c9441d Merge "Don't request account access for apps if it is explictly made not visible to them." into oc-dev 
am: 1827f12b50

Change-Id: I08cd9dee656ace131770214eef2f8667a5b8163a
 2017-05-15 21:24:04 +00:00