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

306897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bfddd29b9b Import translations. DO NOT MERGE 
Change-Id: I148a1107957e81169b55693f0f7c6920e9143e9c
Auto-generated-cl: translation import
 2017-02-09 01:39:21 -08:00
TreeHugger Robot
4a7b9f2b90 Merge "Fix a crash when opening app data usage for work profile" 2017-02-08 22:33:47 +00:00
Jean-Michel Trivi
fd4e9e0f8d Merge "AudioService: mute media/game players during phone calls" 2017-02-08 22:28:45 +00:00
Evan Rosky
f10db8e444 Merge "Separate cluster-focus and default-focus." 2017-02-08 22:27:53 +00:00
Tyler Gunn
c1c1c23b17 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e am: 998655f80e 
am: 58d8c5eb07  -s ours

Change-Id: Ic1f76d23f1d0c28c74cbea392a3998181d9d6da7
 2017-02-08 22:10:20 +00:00
Tyler Gunn
58d8c5eb07 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e 
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
 2017-02-08 22:05:45 +00:00
Daniel Sandler
fa234b2f47 Merge changes from topic 'battery3' 
* changes:
  Fix regression in battery size.
  Clean up BatteryMeterDrawable internal api.
 2017-02-08 22:03:14 +00:00
Tyler Gunn
998655f80e Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 
am: e55b11573e

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
 2017-02-08 22:01:07 +00:00
Tyler Gunn
e55b11573e Merge "Change prototype for "setCamera" in IMS VideoProvider." 
am: c164b159f8

Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
 2017-02-08 21:56:39 +00:00
TreeHugger Robot
a327386e90 Merge "Fix typo in ScoredNetwork javadoc." 2017-02-08 21:56:18 +00:00
Treehugger Robot
c164b159f8 Merge "Change prototype for "setCamera" in IMS VideoProvider." 2017-02-08 21:46:44 +00:00
TreeHugger Robot
dc8912b2bd Merge "Delay changing state of added fragments until all executed." 2017-02-08 21:32:44 +00:00
TreeHugger Robot
5d6791a0a7 Merge "Retrieving groups shouldn't have side effects" 2017-02-08 21:32:16 +00:00
Mathias Agopian
988f58728c Merge "moved GraphicEnv from libgui to libui" 2017-02-08 21:27:21 +00:00
TreeHugger Robot
359136303d Merge "Fix NPE when session is finished before service replies." 2017-02-08 21:17:17 +00:00
Roshan Pius
d4194a50a8 Merge changes If970d851,I5bd11574 am: 3c054697fc am: 65eef762a9 am: 6dd6ba628b 
am: b9f9e64619

Change-Id: I7f140b1b3ca363e0a53ffc08b2c6ad9020ecdf45
 2017-02-08 21:15:28 +00:00
Roshan Pius
38a997c06f WifiManager: API upates for O am: fb441f5009 am: aabb1c7ecf am: 02bf13a6c9 
am: ec38eb6988

Change-Id: I1cb223bff8dd29e11316bf69c7f200caac2a125b
 2017-02-08 21:14:19 +00:00
Roshan Pius
507250e5a3 WifiConfiguration: Remove priority field am: 45491113ed am: 51641c20b2 am: 707ced526f 
am: 6a4322b6d6

Change-Id: Iae46e33f4d04f8bff3da569670fe2474d22cd80e
 2017-02-08 21:13:12 +00:00
Roshan Pius
b9f9e64619 Merge changes If970d851,I5bd11574 am: 3c054697fc am: 65eef762a9 
am: 6dd6ba628b

Change-Id: I2e150126a816314c057e31ec5902088814890421
 2017-02-08 21:08:41 +00:00
Roshan Pius
ec38eb6988 WifiManager: API upates for O am: fb441f5009 am: aabb1c7ecf 
am: 02bf13a6c9

Change-Id: I75883c53958f2495a3e906a8940ef2a7ced98ec5
 2017-02-08 21:07:48 +00:00
Roshan Pius
6a4322b6d6 WifiConfiguration: Remove priority field am: 45491113ed am: 51641c20b2 
am: 707ced526f

Change-Id: I294a36db16c8e079cae5b748421dccfbb50dadc4
 2017-02-08 21:06:45 +00:00
Roshan Pius
6dd6ba628b Merge changes If970d851,I5bd11574 am: 3c054697fc 
am: 65eef762a9

Change-Id: I02a05b3b327b79f9b344db0a3b5d5c96b49bcd5a
 2017-02-08 21:01:12 +00:00
Roshan Pius
02bf13a6c9 WifiManager: API upates for O am: fb441f5009 
am: aabb1c7ecf

Change-Id: I0ff9ca3f59b4d10e41fd2d3a38329cc7f71844cf
 2017-02-08 21:00:24 +00:00
Roshan Pius
707ced526f WifiConfiguration: Remove priority field am: 45491113ed 
am: 51641c20b2

Change-Id: I820420e7c38aac3ddff2441cf40dc367b483c0ff
 2017-02-08 20:59:17 +00:00
Andrew Sapperstein
d99f0f8cd1 Merge "Add additional logging for temperature readings." 2017-02-08 20:58:55 +00:00
TreeHugger Robot
6305ebd6dd Merge "hotspot2: fix typo in the getter functions" 2017-02-08 20:52:39 +00:00
Roshan Pius
65eef762a9 Merge changes If970d851,I5bd11574 
am: 3c054697fc

Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
 2017-02-08 20:50:02 +00:00
Roshan Pius
aabb1c7ecf WifiManager: API upates for O 
am: fb441f5009

Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
 2017-02-08 20:49:57 +00:00
Roshan Pius
51641c20b2 WifiConfiguration: Remove priority field 
am: 45491113ed

Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
 2017-02-08 20:49:13 +00:00
songjinshi
bf99f78a38 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3 am: 36bcc913f7 
am: 78a3d9dab4

Change-Id: I421bf706b51fb657855dbc71a13919982e70fd44
 2017-02-08 20:42:42 +00:00
Erik Wolsheimer
8edf9d8c4b DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f am: 7600235339 
am: a9492dcfdd  -s ours

Change-Id: I766015ee47f4732cdadea7b36d9007a3f0920864
 2017-02-08 20:41:28 +00:00
Paul Duffin
5701db93d6 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45 am: 9250814fd2 
am: c02f6bb64b  -s ours

Change-Id: If23532663b7cce494d8c9b651e0315522202b832
 2017-02-08 20:40:18 +00:00
Paul Lawrence
722ec540a2 Merge "Expand seccomp whitelist" am: fd77a331eb am: 1201ce98dd am: e9799155c9 
am: e0c1cde9c2

Change-Id: Iadf2fa37a64074f306b5b6ddb4d8c81644c3383d
 2017-02-08 20:39:08 +00:00
Treehugger Robot
3c054697fc Merge changes If970d851,I5bd11574 
* changes:
  WifiManager: API upates for O
  WifiConfiguration: Remove priority field
 2017-02-08 20:38:14 +00:00
Tyler Gunn
00f033f234 Merge "Add support for wait-on-handlers command." am: da6d683caa am: a3b4985ad4 am: 3e086be542 
am: 8d2d9d758f

Change-Id: Ib2373609eb15e65ae86e14e081c72909d1fd5808
 2017-02-08 20:37:32 +00:00
Julia Reynolds
74856c4a61 Retrieving groups shouldn't have side effects 
Test: runtest systemui-notification, viewing settings
Change-Id: Ib43fe6ad2af4763b633ad1690f69d17533915dbb
 2017-02-08 20:35:14 +00:00
songjinshi
78a3d9dab4 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3 
am: 36bcc913f7

Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd
 2017-02-08 20:28:48 +00:00
songjinshi
36bcc913f7 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 
am: ec69bd0aa3

Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb
 2017-02-08 20:22:26 +00:00
TreeHugger Robot
4127c138e1 Merge "FloatingToolbar: Support for menu groups." 2017-02-08 20:19:52 +00:00
Erik Wolsheimer
a9492dcfdd DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f 
am: 7600235339

Change-Id: I04996cdf09f06dd4267693eea2ed1ee75239ea90
 2017-02-08 20:19:41 +00:00
Paul Duffin
c02f6bb64b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45 
am: 9250814fd2

Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c
 2017-02-08 20:18:34 +00:00
songjinshi
ec69bd0aa3 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." 
am: b6f7a85b85

Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
 2017-02-08 20:18:13 +00:00
Paul Lawrence
e0c1cde9c2 Merge "Expand seccomp whitelist" am: fd77a331eb am: 1201ce98dd 
am: e9799155c9

Change-Id: If9652ab58b37d2011251345bf5e85afdb3bac4d6
 2017-02-08 20:17:35 +00:00
Erik Wolsheimer
93fa34b156 DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f am: 36008dd6bd 
am: 39c36cab3a  -s ours

Change-Id: I2d0cf6c333eb30eec757d27e9d1be7ed9fa7283b
 2017-02-08 20:16:21 +00:00
Tyler Gunn
8d2d9d758f Merge "Add support for wait-on-handlers command." am: da6d683caa am: a3b4985ad4 
am: 3e086be542

Change-Id: Ib704d3d5c67b987e4daa375c6ca7f2b1a5d8fdbb
 2017-02-08 20:16:15 +00:00
TreeHugger Robot
d927a0e24e Merge "New internal interface method to get the active scorer metadata." 2017-02-08 20:12:54 +00:00
Treehugger Robot
b6f7a85b85 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." 2017-02-08 20:11:23 +00:00
Fan Zhang
73b161ddc1 Fix a crash when opening app data usage for work profile 
The icon on app header is a clone of original app icon, which relies on
getConstantState() of the orginal drawable non-null.

Change-Id: Ice5360f5d00d99b3cfe538b167ce67fc06d5e402
Fix: 34190136
Test: make RunSettingsLibRoboTests
 2017-02-08 12:02:52 -08:00
TreeHugger Robot
a0db8b655f Merge "Fixing small issues with drag-to-dismiss window." 2017-02-08 20:01:27 +00:00
Erik Wolsheimer
39c36cab3a DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f 
am: 36008dd6bd

Change-Id: Ia7e636049d4a3a0490013a54ffb90d7f4f534949
 2017-02-08 20:01:24 +00:00