Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
326,561 Commits 3 Branches 0 Tags
137d09aa074df979110db4d700ade5a68559d27a
Commit Graph

326561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
828512f14c Revert "Instrument captive portal login activity" 
This reverts commit f867da14ea.

Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
 2017-06-09 11:30:05 +00:00
Android Build Merger (Role)
7dcba84cbe Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde am: d1e55c133d" into oc-dr1-dev-plus-aosp 2017-06-09 11:27:27 +00:00
Bryce Lee
07b4c8fec0 Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde 
am: d1e55c133d

Change-Id: I20352302ad5d8691993547214a92956d9c182cf3
 2017-06-09 11:25:07 +00:00
Bryce Lee
014d0ebc8f Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde 
am: cbf1bd40ea

Change-Id: I5770bf1ed814ba03bad9a08c0cf59151aef34100
 2017-06-09 11:25:02 +00:00
Bryce Lee
cbf1bd40ea Merge "Prioritize reused activity's stack over computed stack." into oc-dev 
am: ac56b8adde

Change-Id: I78c8fc62d4050546896262245785084fd5cab609
 2017-06-09 11:18:04 +00:00
Bryce Lee
d1e55c133d Merge "Prioritize reused activity's stack over computed stack." into oc-dev 
am: ac56b8adde

Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12
 2017-06-09 11:17:58 +00:00
Bryce Lee
ac56b8adde Merge "Prioritize reused activity's stack over computed stack." into oc-dev 2017-06-09 11:11:17 +00:00
Erik Kline
daa0bd49ea Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60 am: ad3fd82f8b 
am: b9fc817f59

Change-Id: I178130e65db4fef26d62ea7eaa9a52f7e8103432
 2017-06-09 09:31:05 +00:00
Erik Kline
b9fc817f59 Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60 
am: ad3fd82f8b

Change-Id: Ib1f41df1200378191c0722a280939ccbde539920
 2017-06-09 09:23:37 +00:00
Erik Kline
ad3fd82f8b Merge "Convert IControlsTethering from interface into callback" 
am: 5b9d362b60

Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3
 2017-06-09 09:16:01 +00:00
Erik Kline
5b9d362b60 Merge "Convert IControlsTethering from interface into callback" 2017-06-09 09:06:41 +00:00
Hugo Benichi
34201d8d2a Merge "Instrument captive portal login activity" am: b213053def am: 30b7dfb526 
am: d614cd3509  -s ours

Change-Id: I71166b2679994e342ca72398c68f6751ee2d5fa3
 2017-06-09 07:24:42 +00:00
Hugo Benichi
0eddee8c78 Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc am: 75792d4299 -s ours 
am: 97520fb0dd  -s ours

Change-Id: Ia8e70a92b70cc1321024156c5a8879352827d567
 2017-06-09 07:16:18 +00:00
Hugo Benichi
d614cd3509 Merge "Instrument captive portal login activity" am: b213053def 
am: 30b7dfb526

Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891
 2017-06-09 07:11:46 +00:00
Hugo Benichi
97520fb0dd Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc 
am: 75792d4299  -s ours

Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd
 2017-06-09 07:08:25 +00:00
Hugo Benichi
30b7dfb526 Merge "Instrument captive portal login activity" 
am: b213053def

Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207
 2017-06-09 06:50:52 +00:00
Hugo Benichi
75792d4299 Merge "New Metrics constants for captive portal related UI" 
am: aac9aff5dc

Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2
 2017-06-09 06:47:47 +00:00
Romain Guy
0a78ce67b4 Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev 
am: c025347cf2

Change-Id: I67be64383eeac28ea84ae02a351a92d078b4dac8
 2017-06-09 06:40:44 +00:00
Hugo Benichi
b213053def Merge "Instrument captive portal login activity" 2017-06-09 06:39:19 +00:00
Hugo Benichi
aac9aff5dc Merge "New Metrics constants for captive portal related UI" 2017-06-09 06:38:11 +00:00
Romain Guy
c025347cf2 Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev 2017-06-09 06:34:42 +00:00
fionaxu
4efae6f244 add an extra for rebroadcast of SIM_STATE_CHANGED 
Bug: 62459330
Test: Manaual Test
Change-Id: I0e1c676d99a38273047a84d4467cff44dae7c5af
 2017-06-08 22:50:18 -07:00
Hugo Benichi
f867da14ea 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]

Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c

(cherry picked from commit c61dc92fc0)

Change-Id: I9184f6263a003c2be28f41a550c6164c8d6ee907
 2017-06-09 14:08:39 +09:00
Sungsoo
39f479fe7e Fix the finding logic of MediaButtonSession 
When we find a media button session with the given UID, we should
ignore the sessions whose playback state is not set.

Bug: 62373831
Test: passed CtsMediaTestCases
Change-Id: I484c888c5bdbceb85dd4524c1353906efc0c4f02
 2017-06-09 13:55:48 +09:00
Android Build Merger (Role)
e97fb9f8a3 Merge "Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a am: 81c8d5f861" into oc-dr1-dev-plus-aosp 2017-06-09 04:45:09 +00:00
Selim Cinek
cec2a56c74 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a 
am: 81c8d5f861

Change-Id: I4cf8932e64329727d23da074d2ba7af08718676f
 2017-06-09 04:44:04 +00:00
Selim Cinek
2afc9a8fe3 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a 
am: 4ab7b364a5

Change-Id: I1835b0a6ba2b5b677ba0ec33c9ba3749364e819e
 2017-06-09 04:42:32 +00:00
Android Build Merger (Role)
9d6ddff5c0 Merge "Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205bd7 am: 0ae979806f" into oc-dr1-dev-plus-aosp 2017-06-09 04:38:56 +00:00
Selim Cinek
81c8d5f861 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev 
am: dc66506f0a

Change-Id: I541a5d64c0111057b709ca7179ff439da02bed29
 2017-06-09 04:38:10 +00:00
Selim Cinek
4ab7b364a5 Merge "Fixed an issue where the notification could stay userlocked" into oc-dev 
am: dc66506f0a

Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed
 2017-06-09 04:36:31 +00:00
Selim Cinek
9a43beb652 Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205bd7 
am: 0ae979806f

Change-Id: Ibd7703fbe50943517f448dbed2372b20ee355a2e
 2017-06-09 04:36:30 +00:00
Selim Cinek
b2f177cfed Merge "Fixed a bug where systemui could crash while cloning" into oc-dev am: b9eb205bd7 
am: f62145a41a

Change-Id: I55c470ed539b2ace8d79f7418a8c0ead1f19c3a1
 2017-06-09 04:36:27 +00:00
Selim Cinek
0ae979806f Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 
am: b9eb205bd7

Change-Id: I5b1ff4ba5708c7d470940fd46074aefe9c210b83
 2017-06-09 04:30:51 +00:00
Selim Cinek
f62145a41a Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 
am: b9eb205bd7

Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
 2017-06-09 04:30:47 +00:00
Android Build Merger (Role)
801559a611 Merge "Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am: d1f55f6302 am: 9f23608173" into oc-dr1-dev-plus-aosp 2017-06-09 04:28:25 +00:00
Jorim Jaggi
9c7302244b Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am: d1f55f6302 
am: 9f23608173

Change-Id: I4c25856ca91283541a3d298e2f918db92f5c34d4
 2017-06-09 04:26:52 +00:00
Selim Cinek
dc66506f0a Merge "Fixed an issue where the notification could stay userlocked" into oc-dev 2017-06-09 04:25:42 +00:00
Jorim Jaggi
f852cee52a Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am: d1f55f6302 
am: 8fee9425e4

Change-Id: I0e88c75cea5b39aadd829470c1b299cf10444e5a
 2017-06-09 04:24:38 +00:00
Android Build Merger (Role)
5ccfb31de9 Merge "Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am: 713ad88afe am: e7a5369ab4" into oc-dr1-dev-plus-aosp 2017-06-09 04:22:13 +00:00
Selim Cinek
b9eb205bd7 Merge "Fixed a bug where systemui could crash while cloning" into oc-dev 2017-06-09 04:22:06 +00:00
Jorim Jaggi
8d86879c78 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am: 713ad88afe 
am: e7a5369ab4

Change-Id: Ia8a8bfa87ccb193e27093df069c3996f46c44dd1
 2017-06-09 04:21:09 +00:00
Jorim Jaggi
f84ea8d669 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am: 713ad88afe 
am: af3829adf4

Change-Id: I4e75a7ccdedc15cb428edbf65624ad3181313b7c
 2017-06-09 04:18:44 +00:00
Jorim Jaggi
8fee9425e4 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev 
am: d1f55f6302

Change-Id: Ibc28f6019637dbc9696c62f1ad1ce4679954fbd5
 2017-06-09 04:16:28 +00:00
Jorim Jaggi
9f23608173 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev 
am: d1f55f6302

Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257
 2017-06-09 04:15:12 +00:00
Jorim Jaggi
e7a5369ab4 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev 
am: 713ad88afe

Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039
 2017-06-09 04:11:31 +00:00
Jorim Jaggi
af3829adf4 Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev 
am: 713ad88afe

Change-Id: Idd18d8e092b1628eb0a08d579d6a6a488ce01026
 2017-06-09 04:11:29 +00:00
Jorim Jaggi
d1f55f6302 Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev 2017-06-09 04:06:43 +00:00
Jorim Jaggi
713ad88afe Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev 2017-06-09 04:05:38 +00:00
Hugo Benichi
9e8ab43ab2 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
(cherry picked from commit c61dc92fc0)
 2017-06-09 02:51:36 +00:00
Felipe Leme
fad3a83a93 Minor fix on autofill() javadoc. 
Bug: 62465574
Test: N/A

Change-Id: I4a55b4064a8af835e962a77c6ad55a29c1954efd
 2017-06-08 18:50:27 -07:00