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

343411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e57a4f85bf Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics." 2017-09-12 22:04:29 +00:00
Yi Jin
4518ea94fd Merge changes Icdcbeded,I6753df11 
* changes:
  Extract IncidentHeaderProto to a separated file for statsd to consume
  Implement Pii Stripper Part 3
 2017-09-12 21:40:31 +00:00
Yi Jin
a425dc36e8 Merge "Implement PII Stripper, part 2" 2017-09-12 21:35:19 +00:00
Mathieu Chartier
5feb624495 Merge "Add some extra zygote preloads" 2017-09-12 20:18:54 +00:00
James Hawkins
b1dc6ca8c9 Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics. 
Bug: 63584589
Test: None
Change-Id: Iad6941df5a357e3a1471d446e9776d8412d9e215
 2017-09-12 13:16:03 -07:00
TreeHugger Robot
58361cbef4 Merge "Binder: Change reaction to Error" 2017-09-12 20:00:28 +00:00
TreeHugger Robot
82787dc02e Merge "Fix a typo in metric constant" 2017-09-12 19:50:21 +00:00
Bryce Lee
9b22eb1ef0 Merge "Update reference to top activity." 2017-09-12 19:42:55 +00:00
Jeff Sharkey
16fd4b2dff Merge "Move even more vold commands over to Binder." 2017-09-12 19:21:02 +00:00
Beverly Tai
9ac371a81e Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 am: 517bb6eaa6" into oc-mr1-dev-plus-aosp 
am: 071443e933  -s ours

Change-Id: I62ede21d3aeec251d7c702da3ee824d4a8c49e17
 2017-09-12 17:46:18 +00:00
Bryce Lee
0362536924 Update reference to top activity. 
A condition dealing with a paused top activity references the last
paused activity rather than the top activity. While technically
correct, this may be confusing. Updating to solely reference the
top activity.

Fixes: 65585235
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
Change-Id: Ie67cb8b103e7dec59b1c0b40a5bb35ef0c3cb2b7
 2017-09-12 17:45:28 +00:00
Beverly Tai
6f76cee0a5 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 am: 108e142d61 
am: ae86706b68  -s ours

Change-Id: I68dbff15a630e518c2500ae4c8d8b8bfc9e3a83e
 2017-09-12 17:38:27 +00:00
Android Build Merger (Role)
071443e933 Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 am: 517bb6eaa6" into oc-mr1-dev-plus-aosp 2017-09-12 17:29:11 +00:00
Beverly Tai
3b048905d6 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 
am: 517bb6eaa6

Change-Id: I8d89c0f195d37c1588fd7e1a77fcd97fb97fc775
 2017-09-12 17:27:18 +00:00
Beverly Tai
ae86706b68 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 
am: 108e142d61

Change-Id: Ic7391a1b769b3621025b007dd07863cacea3af6e
 2017-09-12 17:26:56 +00:00
Fan Zhang
2458f25614 Fix a typo in metric constant 
Bug: 65522852
Test: builds
Change-Id: I6f7d8074177095919684be49131b79b4c6c5c168
 2017-09-12 10:24:27 -07:00
Beverly Tai
517bb6eaa6 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec 
am: 0392ba5f72

Change-Id: I84fe2d446aa887c2934224c772d5b0ab7b570f5b
 2017-09-12 17:18:01 +00:00
Beverly Tai
108e142d61 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec 
am: 0392ba5f72

Change-Id: Ife88f86f94919d731e79f7ec5838b14fbb30a4cc
 2017-09-12 17:17:52 +00:00
Abodunrinwa Toki
9857eb58da Merge "Log the "change selected text" gesture." into oc-mr1-dev am: bb3a812a71 
am: 13ca88dbf6  -s ours

Change-Id: I93b2adbba15fd04ae12a14d3871af85947b8a1fa
 2017-09-12 17:12:14 +00:00
Beverly Tai
0392ba5f72 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours 
am: ff5a0512ec

Change-Id: Icd9cc186849eba7d03afe0456c92017be2f1dc4e
 2017-09-12 17:08:07 +00:00
Abodunrinwa Toki
13ca88dbf6 Merge "Log the "change selected text" gesture." into oc-mr1-dev 
am: bb3a812a71

Change-Id: I7c81e50fadfa2f2fc8d3c62c69250c0f9f618651
 2017-09-12 17:02:44 +00:00
Beverly Tai
ff5a0512ec Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 
am: be95e1d91e  -s ours

Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570
 2017-09-12 16:57:46 +00:00
TreeHugger Robot
bb3a812a71 Merge "Log the "change selected text" gesture." into oc-mr1-dev 2017-09-12 16:50:15 +00:00
Beverly Tai
be95e1d91e Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 
am: 4bdddadcc5

Change-Id: I0530a9ca24c432ee0a4af4861bad7976ca355070
 2017-09-12 16:49:49 +00:00
TreeHugger Robot
0d98a2f1e5 Merge "Log the "change selected text" gesture." 2017-09-12 16:43:50 +00:00
Beverly Tai
4bdddadcc5 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 
am: 6cd1142360

Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789
 2017-09-12 16:41:18 +00:00
Beverly Tai
6cd1142360 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 
am: b4913b7093

Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
 2017-09-12 16:32:29 +00:00
Beverly Tai
b4913b7093 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours 
am: 5252746fe0

Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68
 2017-09-12 16:23:44 +00:00
Jeff Sharkey
e14a95a1b4 Merge "Explicitly update permissions after pre-grants." 2017-09-12 16:21:40 +00:00
Beverly Tai
5252746fe0 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec 
am: c64209fb6a  -s ours

Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37
 2017-09-12 16:15:49 +00:00
Beverly Tai
c64209fb6a Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 
am: ff058a78ec

Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
 2017-09-12 16:09:38 +00:00
Evan Laird
bb45fa0951 Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev am: 6201780278 
am: 38ab0009de

Change-Id: Ic633ade7f03854db9da3e4ff88fe4ed964f56ff3
 2017-09-12 16:07:10 +00:00
Andreas Gampe
1cd76f5c93 Binder: Change reaction to Error 
Instead of aborting immediately with a native error, try to call
Thread.dispatchUncaughtException to trigger a Java-side abort.
Only fall back to the old strategy if this fails.

Bug: 64689630
Test: m
Test: manual test
Change-Id: If07a04d3769f3b9181c4736220333df9a2871a16
 2017-09-12 09:02:23 -07:00
Beverly Tai
ff058a78ec Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours 
am: d0d0fea3d6

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
 2017-09-12 16:01:36 +00:00
Evan Laird
38ab0009de Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev 
am: 6201780278

Change-Id: I24adfb04cdafcaf6269ef04029bc607937b0b9ad
 2017-09-12 15:58:08 +00:00
Amith Yamasani
7bd888bea6 Merge "Remove incorrect note about truncation in the javadoc" 2017-09-12 15:54:47 +00:00
Beverly Tai
d0d0fea3d6 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev 
am: 89a94b706d  -s ours

Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
 2017-09-12 15:53:38 +00:00
TreeHugger Robot
6201780278 Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev 2017-09-12 15:49:52 +00:00
Beverly Tai
89a94b706d Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev 2017-09-12 15:29:21 +00:00
TreeHugger Robot
9ffc81b315 Merge "Remove org.apache.http classes from preloaded classes" 2017-09-12 15:02:51 +00:00
Bryce Lee
e200df021e Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev am: 8c8ae38eac 
am: a61fc4ff79

Change-Id: Ia879bc9ddf0cb11764e0669aa05be93da89d6f2e
 2017-09-12 14:37:37 +00:00
Beverly
9b1d542985 DO NOT MERGE Backporting potential usb tapjacking precaution. 
Bug: 62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
 2017-09-12 14:32:59 +00:00
Bryce Lee
a61fc4ff79 Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev 
am: 8c8ae38eac

Change-Id: I174e78c4f26f9b9fa77a91c04353c75a2197ebd4
 2017-09-12 14:29:34 +00:00
Bryce Lee
8c8ae38eac Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev 2017-09-12 14:20:50 +00:00
Abodunrinwa Toki
89bda32771 Log the "change selected text" gesture. 
This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Merged-In: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
 2017-09-12 14:04:42 +01:00
Abodunrinwa Toki
bf2889f4b3 Merge "Fix smart selection logging bugs." into oc-mr1-dev am: 9cbaa8c7e6 
am: 646726f2f9  -s ours

Change-Id: I45725e8837afed6d02081971bb78a927099b36f2
 2017-09-12 12:56:59 +00:00
Abodunrinwa Toki
78940eb859 Log the "change selected text" gesture. 
This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
 2017-09-12 13:53:04 +01:00
Abodunrinwa Toki
646726f2f9 Merge "Fix smart selection logging bugs." into oc-mr1-dev 
am: 9cbaa8c7e6

Change-Id: I00dfe6ac59782f431b5f50f059055d9537b73ae8
 2017-09-12 12:49:03 +00:00
Jorim Jaggi
299670949f Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev am: d9ad8cbb0c 
am: ed409dd2ca

Change-Id: Ie0fb3688bf2f5be1f60f760a51f387d1e88fee82
 2017-09-12 12:46:06 +00:00
TreeHugger Robot
9cbaa8c7e6 Merge "Fix smart selection logging bugs." into oc-mr1-dev 2017-09-12 12:39:42 +00:00