git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]

Instrument captive portal login activity

Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.

Bug: 36203355
Bug: 34901696
Bug: 36532213
Test: manually tested with captive portal testing setup while watching
      event logs: adb logcat -b events | grep captiveportallogin
        06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
        06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]

Change-Id: Ia05853506d424ad4cb2c11770ae7718fbef3f01c

commit | commitdiff | tree

Erik Kline [Thu, 8 Jun 2017 12:37:56 +0000 (12:37 +0000)]

Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe am: 8bc87070f9 am: ad652cbcf3
am: f661ef9905

Change-Id: I9937297727aa1a063e499fccd5833ace229b1e8a

commit | commitdiff | tree

Erik Kline [Thu, 8 Jun 2017 12:28:58 +0000 (12:28 +0000)]

Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe am: 8bc87070f9
am: ad652cbcf3

Change-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b

commit | commitdiff | tree

Erik Kline [Thu, 8 Jun 2017 12:20:31 +0000 (12:20 +0000)]

Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe
am: 8bc87070f9

Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e

commit | commitdiff | tree

Erik Kline [Thu, 8 Jun 2017 12:11:59 +0000 (12:11 +0000)]

Merge "Move findPreferredUpstreamType into UNM"
am: 32703994fe

Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff

commit | commitdiff | tree

Treehugger Robot [Thu, 8 Jun 2017 12:02:59 +0000 (12:02 +0000)]

Merge "Move findPreferredUpstreamType into UNM"

commit | commitdiff | tree

Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]

Move findPreferredUpstreamType into UNM

This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.

Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.

Test: as follows
    - built
    - flashed
    - booted
    - runtest framework-net passed
Bug: 32163131

Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:59:53 +0000 (06:59 +0000)]

Merge "Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 07d2221218" into oc-dr1-dev-plus-aosp am: d20b1c96d7"

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 06:58:59 +0000 (06:58 +0000)]

Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 07d2221218" into oc-dr1-dev-plus-aosp
am: d20b1c96d7

Change-Id: I5ef1ecadd0b0bf9ed4ffc4c4ca6b49269035fe64

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:58:22 +0000 (06:58 +0000)]

Merge "Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: 53bdeb1a46" into oc-dr1-dev-plus-aosp am: 1fa70d7a3e"

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 06:57:38 +0000 (06:57 +0000)]

Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: 53bdeb1a46" into oc-dr1-dev-plus-aosp
am: 1fa70d7a3e

Change-Id: Ifc814c5f411992118741f997b2e9866f7f4f3b01

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:57:03 +0000 (06:57 +0000)]

Merge "Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 4d579eacec" into oc-dr1-dev-plus-aosp am: 5f7c800fbf"

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 06:55:58 +0000 (06:55 +0000)]

Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 4d579eacec" into oc-dr1-dev-plus-aosp
am: 5f7c800fbf

Change-Id: I2f77dcf6b8a47ca5d4dbd036303d6c4ea92a633c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:55:25 +0000 (06:55 +0000)]

Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: c592c63a2d am: 692fee87c6"

commit | commitdiff | tree

Yuchen He [Thu, 8 Jun 2017 06:54:24 +0000 (06:54 +0000)]

Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: c592c63a2d
am: 692fee87c6

Change-Id: I6849ea5b1fcdf49ae07e01e4a88b537feea6e8cd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:53:58 +0000 (06:53 +0000)]

Merge "Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp am: 83330b44a8"

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 06:53:50 +0000 (06:53 +0000)]

Merge "Expect hasGlyph support for text presentation sequences"

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 06:53:08 +0000 (06:53 +0000)]

Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp
am: 83330b44a8

Change-Id: I18f70357d7bb3361219883f5597c2c370d8b2374

commit | commitdiff | tree

Yuchen He [Thu, 8 Jun 2017 06:50:09 +0000 (06:50 +0000)]

Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: 43f1ee3ac8" into oc-dr1-dev-plus-aosp
am: f097dc9d20

Change-Id: I450c1771f11b0c756e89bc434ef2e6b4cb1799d7

commit | commitdiff | tree

Adam Bookatz [Thu, 8 Jun 2017 06:45:20 +0000 (06:45 +0000)]

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 0fcadeaeb9" into oc-dr1-dev-plus-aosp
am: 263b044a1d

Change-Id: I9601f561e1b5b064016cc8014efc66088473eb26

commit | commitdiff | tree

Andreas Gampe [Thu, 8 Jun 2017 06:37:58 +0000 (06:37 +0000)]

Merge "Framework: Remove SamplingProfiler" am: d2ecee2506 am: 3ea0309e39 -s ours am: 76f6da62e6 -s ours
am: ed8e5659cf -s ours

Change-Id: I7e8019aeef3bdb4985e878645f49ee8a7d55bff0

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:35:53 +0000 (06:35 +0000)]

Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 23e5a1ee65" into oc-dr1-dev-plus-aosp
am: 041bb40935

Change-Id: I0779872f680ceaa5012f8a805cc0d77fe34bfe56

commit | commitdiff | tree

Phil Weaver [Thu, 8 Jun 2017 06:33:26 +0000 (06:33 +0000)]

Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 7c44479edf" into oc-dr1-dev-plus-aosp
am: d7e9fb62d5

Change-Id: I5fad4d6c82ef1d9181c06ec370d468fe548b2893

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:28:33 +0000 (06:28 +0000)]

Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: de066fd249" into oc-dr1-dev-plus-aosp
am: 56f83527ae

Change-Id: I06d1dec5693658716d7ade11b93a1ae419111594

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:26:07 +0000 (06:26 +0000)]

Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 07d2221218" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adam Bookatz [Thu, 8 Jun 2017 06:26:13 +0000 (06:26 +0000)]

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp
am: 36e8ee9c1f

Change-Id: I2a6635ee9f53510661e9f15e32b3959bbd440aae

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:23:51 +0000 (06:23 +0000)]

Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 4d2a9a9f50" into oc-dr1-dev-plus-aosp
am: ed07898d13

Change-Id: I468d43c265ab002ccabd3f33f8375d81f17ac66e

commit | commitdiff | tree

Phil Weaver [Thu, 8 Jun 2017 06:21:17 +0000 (06:21 +0000)]

Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 3d5bf99e7f" into oc-dr1-dev-plus-aosp
am: fc7d48e703

Change-Id: I63ed1c2aa9174155cf472112bfc2f96d2c5116aa

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 06:20:24 +0000 (06:20 +0000)]

Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918
am: 07d2221218

Change-Id: If47f67c7bf291e44015c92708eca0ff00a2a14b8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:59 +0000 (06:19 +0000)]

Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: 53bdeb1a46" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:27 +0000 (06:19 +0000)]

Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 4d579eacec" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 06:19:10 +0000 (06:19 +0000)]

Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
am: 53bdeb1a46

Change-Id: If4ba8d279d1bafbcb606f703a0f7498954c73e62

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 06:18:37 +0000 (06:18 +0000)]

Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918
am: 4d579eacec

Change-Id: I5824d83e8a5043766aa062ff023d5ad82be28d28

commit | commitdiff | tree

Hall Liu [Thu, 8 Jun 2017 06:18:18 +0000 (06:18 +0000)]

Merge "Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c am: b6a16546b5" into oc-dr1-dev-plus-aosp
am: 6e1e2090af

Change-Id: I248ae9690eebd6bd948b736fdca295f3c2f06309

commit | commitdiff | tree

Yuchen He [Thu, 8 Jun 2017 06:17:14 +0000 (06:17 +0000)]

Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b
am: c592c63a2d

Change-Id: If1a4ac40d340b9bd59fda0924bbbc313dbe810c1

commit | commitdiff | tree

Jeff Sharkey [Thu, 8 Jun 2017 06:15:50 +0000 (06:15 +0000)]

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4dfdceb" into oc-dr1-dev-plus-aosp
am: e6d4e7ddb4

Change-Id: I71526da73c0dcb36ec76be4672d554bf4ff23247

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:14:49 +0000 (06:14 +0000)]

Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 06:14:00 +0000 (06:14 +0000)]

Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
am: d88c71a6e2

Change-Id: Ic6204047cd677b339ff3de0ba74e6b194086ea11

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:13:35 +0000 (06:13 +0000)]

Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: 43f1ee3ac8" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Andreas Gampe [Thu, 8 Jun 2017 06:12:48 +0000 (06:12 +0000)]

Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am: 837f1167ca" into oc-dr1-dev-plus-aosp
am: a985db2fb7

Change-Id: I1b368170aa7d7cf17c4294766d721026ae538db5

commit | commitdiff | tree

Yuchen He [Thu, 8 Jun 2017 06:12:35 +0000 (06:12 +0000)]

Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b
am: 43f1ee3ac8

Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:12:06 +0000 (06:12 +0000)]

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 0fcadeaeb9" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Sudheer Shanka [Thu, 8 Jun 2017 06:10:35 +0000 (06:10 +0000)]

Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 2bb4966dab" into oc-dr1-dev-plus-aosp
am: a8ae3296e2

Change-Id: Ie7de0b2c54cacef7db683b053fe1c9ad222f26ee

commit | commitdiff | tree

Adam Bookatz [Thu, 8 Jun 2017 06:09:46 +0000 (06:09 +0000)]

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 0fcadeaeb9

Change-Id: Ieb7b6cd5299bab7f10c84f78e8ae1472988cff60

commit | commitdiff | tree

Andreas Gampe [Thu, 8 Jun 2017 06:08:30 +0000 (06:08 +0000)]

Merge "Framework: Remove SamplingProfiler" am: d2ecee2506 am: 3ea0309e39 -s ours
am: 76f6da62e6 -s ours

Change-Id: If989c3990ed4570ba0feb09a62ecf3e6359d9c0f

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 06:07:15 +0000 (06:07 +0000)]

Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918

Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:05:33 +0000 (06:05 +0000)]

Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 23e5a1ee65" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:05:26 +0000 (06:05 +0000)]

Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: ddb322a000
am: b524ada719

Change-Id: Ib386ad8d8b5b2de2d93bcbf868d056bad4b3e801

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 06:04:54 +0000 (06:04 +0000)]

Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am: 3492ed4376

Change-Id: I49015844829d55a903437a807b345688794002b5

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:04:42 +0000 (06:04 +0000)]

Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
am: 23e5a1ee65

Change-Id: If4f55496f91c671545796f774d7ed5031b97ef86

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:04:13 +0000 (06:04 +0000)]

Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 7c44479edf" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Phil Weaver [Thu, 8 Jun 2017 06:03:29 +0000 (06:03 +0000)]

Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
am: 7c44479edf

Change-Id: Ia25a60f70dd172a7c8dfe5c17e72bdf193b0d3f0

commit | commitdiff | tree

Jeff Sharkey [Thu, 8 Jun 2017 06:03:17 +0000 (06:03 +0000)]

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: b1a2cde4fd" into oc-dr1-dev-plus-aosp
am: c5deced1d8

Change-Id: Ib08956194b971823a44c7ad77791dfcc87362210

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:03:01 +0000 (06:03 +0000)]

Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: de066fd249" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 06:02:07 +0000 (06:02 +0000)]

Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: de066fd249

Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803

commit | commitdiff | tree

Yuchen He [Thu, 8 Jun 2017 06:01:50 +0000 (06:01 +0000)]

Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
am: 3671e9249b

Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:01:36 +0000 (06:01 +0000)]

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 06:00:47 +0000 (06:00 +0000)]

Merge "Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp
am: c9208d362f

Change-Id: Id71b9a4465bd38d8f126a7532b91511a8270950d

commit | commitdiff | tree

Adam Bookatz [Thu, 8 Jun 2017 06:00:42 +0000 (06:00 +0000)]

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 300ebee8c4

Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 06:00:13 +0000 (06:00 +0000)]

Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 4d2a9a9f50" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adam Bookatz [Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)]

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am: 6029bce3b4

Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 05:59:13 +0000 (05:59 +0000)]

Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
am: 4d2a9a9f50

Change-Id: Idceec36ea86ae6b00adb3ee24bbb08c3116403ce

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:58:47 +0000 (05:58 +0000)]

Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 3d5bf99e7f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Phil Weaver [Thu, 8 Jun 2017 05:57:56 +0000 (05:57 +0000)]

Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
am: 3d5bf99e7f

Change-Id: I7649712f41a7746acd21382e651e45fecf67a0cf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:57:26 +0000 (05:57 +0000)]

Merge "Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c am: b6a16546b5" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:56:24 +0000 (05:56 +0000)]

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4dfdceb" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 8 Jun 2017 05:55:56 +0000 (05:55 +0000)]

Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c
am: b6a16546b5

Change-Id: I70d37518b24034a1e133bf6e9248feb64d439e6a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:28 +0000 (05:55 +0000)]

Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am: 837f1167ca" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Thu, 8 Jun 2017 05:55:32 +0000 (05:55 +0000)]

Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
am: 13e4dfdceb

Change-Id: Id489b5ef70eb94b487d5cd913712594f8ca0b723

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:55:03 +0000 (05:55 +0000)]

Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 2bb4966dab" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 05:54:33 +0000 (05:54 +0000)]

Merge changes Iea24e5a1,If71385bc into oc-dev
am: 3834421c96

Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2

commit | commitdiff | tree

Andreas Gampe [Thu, 8 Jun 2017 05:54:32 +0000 (05:54 +0000)]

Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07

commit | commitdiff | tree

Sudheer Shanka [Thu, 8 Jun 2017 05:53:17 +0000 (05:53 +0000)]

Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 736cb0e33a
am: 54a6869814

Change-Id: I5e4151095fe8e7790cae7c2512d8ef609076189f

commit | commitdiff | tree

Sudheer Shanka [Thu, 8 Jun 2017 05:53:00 +0000 (05:53 +0000)]

Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 2bb4966dab

Change-Id: Ib163b6a910f8206a6cc1767608fbbbac85bfd53f

commit | commitdiff | tree

Phil Weaver [Thu, 8 Jun 2017 05:52:11 +0000 (05:52 +0000)]

Merge "Confirm a11y shortcut service for correct user" into oc-dev
am: 03a5b3a509

Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)]

Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: ddb322a000

Change-Id: Ic3ba662f2821aa617be0fa271e92e6cb805097c8

commit | commitdiff | tree

Todd Kennedy [Thu, 8 Jun 2017 05:50:03 +0000 (05:50 +0000)]

Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978

Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:49:10 +0000 (05:49 +0000)]

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: b1a2cde4fd" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 05:48:45 +0000 (05:48 +0000)]

Merge "Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Thu, 8 Jun 2017 05:48:21 +0000 (05:48 +0000)]

Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
am: b1a2cde4fd

Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542

commit | commitdiff | tree

Jeff Sharkey [Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)]

Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504

Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 05:47:17 +0000 (05:47 +0000)]

Merge "resolve merge conflicts of 7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 851bfc38d4

Change-Id: I09268e99da114cdd679f0b7d0b56e9641c79c1df

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 05:46:25 +0000 (05:46 +0000)]

Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev
am: be261948cb

Change-Id: I5f990815a7489828589303ee894ba3c94d6ef370

commit | commitdiff | tree

Sudheer Shanka [Thu, 8 Jun 2017 05:45:37 +0000 (05:45 +0000)]

Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 736cb0e33a

Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a

commit | commitdiff | tree

Sudheer Shanka [Thu, 8 Jun 2017 05:44:49 +0000 (05:44 +0000)]

Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 05:42:17 +0000 (05:42 +0000)]

Merge "resolve merge conflicts of 7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]

Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev

commit | commitdiff | tree

Ian Pedowitz [Thu, 8 Jun 2017 05:41:34 +0000 (05:41 +0000)]

Merge "Fixed an issue where the icons had the wrong color"

commit | commitdiff | tree

Etan Cohen [Thu, 8 Jun 2017 05:38:18 +0000 (05:38 +0000)]

Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev am: 89d6859dc4
am: d35a439a90

Change-Id: Id682350948bbf0687700cbcd9d74e860cf5692df

commit | commitdiff | tree

Etan Cohen [Thu, 8 Jun 2017 05:32:09 +0000 (05:32 +0000)]

Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
am: 89d6859dc4

Change-Id: Ib7dcbb63d9e41c8b9b3c702f883c84de06a23326

commit | commitdiff | tree

Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]

Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 05:25:17 +0000 (05:25 +0000)]

Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918

Change-Id: I5cb2eb64772ea9f3fc189f629be0ddcd29fbe4d9

commit | commitdiff | tree

Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]

Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev

commit | commitdiff | tree

Kevin Chyn [Thu, 8 Jun 2017 04:59:30 +0000 (04:59 +0000)]

Add setting and permission for assist gesture am: 4fddc9fa4d
am: f0e1d6eab8 -s ours

Change-Id: Iaa5eb3ba4d6570563e838e30581560ff94a9936f

commit | commitdiff | tree

Kevin Chyn [Thu, 8 Jun 2017 04:53:31 +0000 (04:53 +0000)]

Add setting and permission for assist gesture
am: 4fddc9fa4d

Change-Id: Ife2ee905017b3a7489b4a338f6ebe59301301bd0

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 04:50:16 +0000 (04:50 +0000)]

Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am: 3492ed4376

Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 04:48:26 +0000 (04:48 +0000)]

Merge "Add system property for hot startup method threshold"

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 04:45:04 +0000 (04:45 +0000)]

Merge "Add permission CHANGE_HDMI_CEC_ACTIVE_SOURCE"

commit | commitdiff | tree

Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]

Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev

commit | commitdiff | tree

Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]

Add setting and permission for assist gesture

Bug: 37427306

Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.