Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,620 Commits 3 Branches 0 Tags
1b331bdd67ec3aa83dd63b247fd2974e5035d40e
Commit Graph

313620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Joslin
1b331bdd67 Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev am: 0bbde28dd4 
am: a1670692ac

Change-Id: If9134de003ad02fea1f3dbcb16c101ee0653ad13
 2017-04-04 19:53:59 +00:00
Selim Gurun
4b2b262de5 Merge "Disable WebView autocomplete feature." into oc-dev am: dd7414a644 
am: 912a291335

Change-Id: I57d82168042a67bbbdd5f4a59a9ecefdb8ca0940
 2017-04-04 19:49:25 +00:00
Dongwon Kang
2b4465cee2 Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev am: 8d84e4cd1c 
am: 9ecff180af

Change-Id: Ia3a31f0c20273fb1fe0fd230c0544a46af54f9d6
 2017-04-04 19:48:20 +00:00
Jeremy Joslin
a1670692ac Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev 
am: 0bbde28dd4

Change-Id: I2a7f903bf824ca057a52a0a5c02873c5d154ec0c
 2017-04-04 19:45:33 +00:00
Adam Lesinski
787f3705b8 Merge "AAPT2: Allow multiple -c flags" into oc-dev am: 7a7e415967 
am: 1f44c49fee

Change-Id: I106ad83a5268f3b71316d2f63ac67759a815ae46
 2017-04-04 19:40:22 +00:00
Selim Gurun
912a291335 Merge "Disable WebView autocomplete feature." into oc-dev 
am: dd7414a644

Change-Id: I7ca639fbafb543dba5d226de3b66e7d90d22da89
 2017-04-04 19:39:16 +00:00
Jean-Michel Trivi
f52ef25a43 Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev am: 6cf445bd3d 
am: f81f4c09b6

Change-Id: Id0163eb6545d772bb13ade341064310bcd7aed43
 2017-04-04 19:39:11 +00:00
TreeHugger Robot
0bbde28dd4 Merge "Migrate the NETWORK_SCORER_APP Setting." into oc-dev 2017-04-04 19:37:20 +00:00
Derek Sollenberger
4d6141c297 Merge "Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation" into oc-dev am: f9340ca491 
am: d75510ab6f

Change-Id: Iffb6644220b68790553ca9fa08ab2e4b532e50cb
 2017-04-04 19:33:52 +00:00
Dongwon Kang
9ecff180af Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev 
am: 8d84e4cd1c

Change-Id: If9ffaf1fd87e3cbc75da01c28142797e58d1cc7f
 2017-04-04 19:33:33 +00:00
Adam Lesinski
1f44c49fee Merge "AAPT2: Allow multiple -c flags" into oc-dev 
am: 7a7e415967

Change-Id: Ifbe2a96da8bc56b052fff69ec4ea8489be1106b3
 2017-04-04 19:32:25 +00:00
TreeHugger Robot
dd7414a644 Merge "Disable WebView autocomplete feature." into oc-dev 2017-04-04 19:31:51 +00:00
Alan Viverette
c2c582bded Merge "Refresh opacity and statefulness on tint change" into oc-dev am: 8f6b9d8058 
am: 77c7e2548a

Change-Id: Id5a18252950b93d2635a7eb1174052080511a07f
 2017-04-04 19:31:19 +00:00
Jean-Michel Trivi
f81f4c09b6 Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev 
am: 6cf445bd3d

Change-Id: Ia8cd7ef85f4577aea668335396ec27533615b3d7
 2017-04-04 19:31:13 +00:00
TreeHugger Robot
8d84e4cd1c Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev 2017-04-04 19:23:25 +00:00
Derek Sollenberger
d75510ab6f Merge "Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation" into oc-dev 
am: f9340ca491

Change-Id: I0dc8a4fec244b71256af54c65791ba75e730f087
 2017-04-04 19:21:50 +00:00
Alan Viverette
77c7e2548a Merge "Refresh opacity and statefulness on tint change" into oc-dev 
am: 8f6b9d8058

Change-Id: Icf83c65990d354e10e3f0a454dcb793cbd592fe7
 2017-04-04 19:19:06 +00:00
TreeHugger Robot
7a7e415967 Merge "AAPT2: Allow multiple -c flags" into oc-dev 2017-04-04 19:14:47 +00:00
Jason Monk
fbcf16502b Merge "Temporary fix for themes" into oc-dev am: 02e5b5c6da 
am: 070fa62c8c

Change-Id: Iddcc7c2feb31ccd3d3310d9c1ea2e090b090de4a
 2017-04-04 19:12:51 +00:00
Jeff Hao
eb5ccf6701 Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev am: 765a1b7857 
am: 65263f96ce

Change-Id: Ib4c920cf6c6aa47e92f59f4114830605895ac8c3
 2017-04-04 19:11:42 +00:00
Jean-Michel Trivi
6cf445bd3d Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev 2017-04-04 19:08:37 +00:00
TreeHugger Robot
f9340ca491 Merge "Fix HWUI/Skia Gradients to premultiply the colors prior to interpolation" into oc-dev 2017-04-04 19:06:32 +00:00
TreeHugger Robot
8f6b9d8058 Merge "Refresh opacity and statefulness on tint change" into oc-dev 2017-04-04 19:05:02 +00:00
George Mount
49c1a82f93 Merge "Fix saving target fragment when Fragment not yet created." into oc-dev am: a16859114d 
am: 8695cbad31

Change-Id: I61a44a0cf781b6152cb10cc383f332ab9f540f10
 2017-04-04 19:01:47 +00:00
Jason Monk
070fa62c8c Merge "Temporary fix for themes" into oc-dev 
am: 02e5b5c6da

Change-Id: I15a2861696d4bc163107d4d7dd18fbce7c363b27
 2017-04-04 19:00:46 +00:00
Jeff Hao
65263f96ce Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev 
am: 765a1b7857

Change-Id: I3b0f0c8933066e63e09effd53ee6cfe2c287ec6e
 2017-04-04 18:59:37 +00:00
George Mount
8695cbad31 Merge "Fix saving target fragment when Fragment not yet created." into oc-dev 
am: a16859114d

Change-Id: Ia61f383eba7639a3c29fcf4a13b53177141e65d2
 2017-04-04 18:55:21 +00:00
TreeHugger Robot
02e5b5c6da Merge "Temporary fix for themes" into oc-dev 2017-04-04 18:53:10 +00:00
TreeHugger Robot
765a1b7857 Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt." into oc-dev 2017-04-04 18:52:14 +00:00
Seigo Nonaka
05c4205a34 Merge "Change justification parameter from boolean to int." into oc-dev am: 04fc05cd66 
am: c81f06186b

Change-Id: I156f5acc74bd7bda77217698dd3756e2c729a035
 2017-04-04 18:45:30 +00:00
TreeHugger Robot
a16859114d Merge "Fix saving target fragment when Fragment not yet created." into oc-dev 2017-04-04 18:45:19 +00:00
Seigo Nonaka
c81f06186b Merge "Change justification parameter from boolean to int." into oc-dev 
am: 04fc05cd66

Change-Id: Ie4fcc93178abfb850068612b02cf3c82dba71377
 2017-04-04 18:39:06 +00:00
TreeHugger Robot
4e4252354d Merge changes from topics 'KeyboardFocusHighlight_mUseDefaultFocusHighlight', 'KeyboardFocusHighlight', 'KeyboardFocusHighlight_DetectUnhandled' 
* changes:
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
 2017-04-04 18:38:21 +00:00
TreeHugger Robot
04fc05cd66 Merge "Change justification parameter from boolean to int." into oc-dev 2017-04-04 18:29:58 +00:00
Jean-Michel Trivi
e4a9911b68 Revert "AudioAttributes: remove static getVolumeControlStream method" 
This reverts commit e0b5bf50d6.

Change-Id: I2f3f10c149b205d22c41d5c9767ea10b0dee7682
 2017-04-04 18:26:44 +00:00
Jesse Evans
132a028bb2 Merge "Merge "Load IA resolver settings from resolver package" into oc-dev am: 7f654b2776" into oc-dev-plus-aosp 
am: 76e2fe9d4d

Change-Id: I88fb622d6a937f75fe27f5d3efa826f7e17faff3
 2017-04-04 18:08:57 +00:00
Sanket Padawe
5cca5338d5 Merge "Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp 
am: 1681765669

Change-Id: I627e6c413eb09ae9ded4ae1322161dbf7be4241e
 2017-04-04 18:05:18 +00:00
Kang Li
f0bc8c6c0d Merge "Add a service to rank apps for ResolverActivity." into oc-dev am: 6df90fa53b 
am: 8b0979666a

Change-Id: I2761e5ed453ee87649fa07d66a2a749116bc5b95
 2017-04-04 17:58:10 +00:00
Android Build Merger (Role)
76e2fe9d4d Merge "Merge "Load IA resolver settings from resolver package" into oc-dev am: 7f654b2776" into oc-dev-plus-aosp 2017-04-04 17:57:50 +00:00
Jesse Evans
73051fc5f1 Merge "Load IA resolver settings from resolver package" into oc-dev 
am: 7f654b2776

Change-Id: I9cfbdd0ec27cd20f2d65ef0520e691ed20082913
 2017-04-04 17:57:08 +00:00
Sanket Padawe
1681765669 Merge "Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp 2017-04-04 17:56:38 +00:00
Robert Carr
6390144d2a Merge "Request layout when updating child layout params." into oc-dev am: b841b4e919 
am: d190369319

Change-Id: I8bf5a74fa0f67636e04fcb7cef269eab4cbd83f6
 2017-04-04 17:53:28 +00:00
Sanket Padawe
edf3bae41e Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed 
Change-Id: I5c5daf994092fba7ef6ff4a2987344f0503d9dfe
 2017-04-04 10:53:19 -07:00
Kang Li
8b0979666a Merge "Add a service to rank apps for ResolverActivity." into oc-dev 
am: 6df90fa53b

Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e
 2017-04-04 17:51:03 +00:00
TreeHugger Robot
7f654b2776 Merge "Load IA resolver settings from resolver package" into oc-dev 2017-04-04 17:48:40 +00:00
Robert Carr
d190369319 Merge "Request layout when updating child layout params." into oc-dev 
am: b841b4e919

Change-Id: Iaaa3317b0dc8c6e320aa4a8b2677bcc9f1735234
 2017-04-04 17:46:16 +00:00
Kang Li
6df90fa53b Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-04 17:42:32 +00:00
TreeHugger Robot
b841b4e919 Merge "Request layout when updating child layout params." into oc-dev 2017-04-04 17:36:48 +00:00
Chris Craik
5d2e064ebf Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev am: eabb5621dd 
am: f497ca5a2e

Change-Id: I0a7bf55e5614b5b8f380332c2cd43d7d14df4e66
 2017-04-04 17:35:53 +00:00
Jeremy Joslin
b0fe21782f Migrate the NETWORK_SCORER_APP Setting. 
Migrate the value of NETWORK_SCORER_APP to the USE_OPEN_WIFI_PACKAGE
Setting if the following conditions are true:
  * NETWORK_SCORER_APP has a value
  * An active scorer/recommender is present.
  * The active scorer specifies a valid UseOpenWifiActivity.
  * The NETWORK_SCORER_APP value matches the package name of the
    UseOpenWifiActivity or the active scorer.

Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Bug: 36718516
Change-Id: I7d7a56c62b4a7f4a0e43824fbb2075e80d7a753b
 2017-04-04 10:25:57 -07:00