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
Lucas Dupin
8584468862 Merge "Fixed keyguard inflation problem" into oc-mr1-dev 
am: 3163ba7458

Change-Id: I7a2d2ddaccaf099bb6a81c4129b8e03ed3d021e1
 2017-09-12 00:00:45 +00:00
Siyamed Sinir
6352ced635 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 
am: 028ad8d498

Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
 2017-09-11 23:50:20 +00:00
TreeHugger Robot
3163ba7458 Merge "Fixed keyguard inflation problem" into oc-mr1-dev 2017-09-11 23:43:51 +00:00
Siyamed Sinir
028ad8d498 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev 
am: 06183a57a6

Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
 2017-09-11 23:42:42 +00:00
Siyamed Sinir
fa3da6023d Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp am: 529c7ea9bd" into oc-mr1-dev-plus-aosp 
am: 0ee5c36e7f

Change-Id: I8560667a92e1c66c59d497efce11ae48790efd7c
 2017-09-11 23:41:10 +00:00
Siyamed Sinir
ffc8c4a2e0 Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43 am: 031e9d5cc8" into oc-mr1-dev-plus-aosp 
am: 45453f2312

Change-Id: I56e86cde34b139db0909a037806eabd10ecb10b0
 2017-09-11 23:38:08 +00:00
TreeHugger Robot
ab2da49792 Merge "AAPT2: Handle inflating compiled attributes." 2017-09-11 23:34:34 +00:00
Android Build Merger (Role)
63fd2d6b2d Merge "Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 am: 2602e5ff62 am: ab9cd2868e am: c0a0a08ee8" 2017-09-11 23:33:07 +00:00
Tarandeep Singh
c5248ade5a Merge "Enhance IME support in ActivityView for AAe." 2017-09-11 23:32:40 +00:00
Siyamed Sinir
06183a57a6 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev 2017-09-11 23:31:44 +00:00
Jordan Liu
2687abc188 Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 am: 2602e5ff62 am: ab9cd2868e 
am: c0a0a08ee8

Change-Id: I2ae4702a288943cee889edd03a565ad2be39ac30
 2017-09-11 23:31:35 +00:00
Android Build Merger (Role)
0ee5c36e7f Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp am: 529c7ea9bd" into oc-mr1-dev-plus-aosp 2017-09-11 23:28:14 +00:00
Android Build Merger (Role)
45453f2312 Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43 am: 031e9d5cc8" into oc-mr1-dev-plus-aosp 2017-09-11 23:25:55 +00:00
Siyamed Sinir
1ae69adf4a Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp 
am: 529c7ea9bd

Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1
 2017-09-11 23:25:46 +00:00
Siyamed Sinir
b4879652c6 Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43 
am: 031e9d5cc8

Change-Id: I0e7b2804bc3cb8a356b2a57691dec44342b8c999
 2017-09-11 23:24:21 +00:00
Mathieu Chartier
097ab6bea6 Merge "Add some extra zygote preloads" into oc-mr1-dev am: 15998c4d01 
am: 012be1c455

Change-Id: I316b2161bf2b4a78865c8b908aaf6f17c64ab76a
 2017-09-11 23:23:55 +00:00
Jordan Liu
c0a0a08ee8 Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 am: 2602e5ff62 
am: ab9cd2868e

Change-Id: Ief0f4d2f5c53917cc1f8d91091bf1644bc7c3589
 2017-09-11 23:21:48 +00:00
Abodunrinwa Toki
cd2497b534 Fix smart selection logging bugs. 
- Fix count with selection start index inside a word
- Properly handle whitespace characters
- Set the model version tag

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
Change-Id: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
 2017-09-12 00:20:40 +01:00
Siyamed Sinir
031e9d5cc8 Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c 
am: 491aaaae43

Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f
 2017-09-11 23:18:51 +00:00
Android Build Merger (Role)
529c7ea9bd Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp 2017-09-11 23:18:13 +00:00
Siyamed Sinir
7cd69439f0 Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c 
am: 491aaaae43

Change-Id: I38a64e635f6820ca5368d154363ea3414c8e047e
 2017-09-11 23:16:13 +00:00
Jordan Liu
ab9cd2868e Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1 
am: 2602e5ff62

Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5
 2017-09-11 23:14:59 +00:00
Mathieu Chartier
012be1c455 Merge "Add some extra zygote preloads" into oc-mr1-dev 
am: 15998c4d01

Change-Id: I9164d6c8816c9cfaabe85b0e33c7eed76682e1fd
 2017-09-11 23:11:52 +00:00
Siyamed Sinir
491aaaae43 Merge "Prevent getting data from Clipboard if device is locked" into oc-dev 
am: 846a46043c

Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00
 2017-09-11 23:06:27 +00:00
Jordan Liu
2602e5ff62 Merge "Show 3G data icon for TD-SCDMA network type" 
am: 9da895b5e1

Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
 2017-09-11 23:06:22 +00:00
Amith Yamasani
8a0a614f45 Remove incorrect note about truncation in the javadoc 
UsageStats is not truncating the events returned by queryEvents.
So removed the javadoc note that is no longer true.

Bug: 65556357
Test: N/A
Change-Id: I8206176951c3a3079b8317043f4cb696ffca67c0
 2017-09-11 16:01:04 -07:00
TreeHugger Robot
15998c4d01 Merge "Add some extra zygote preloads" into oc-mr1-dev 2017-09-11 22:59:41 +00:00
Jordan Liu
9da895b5e1 Merge "Show 3G data icon for TD-SCDMA network type" 2017-09-11 22:52:20 +00:00
Siyamed Sinir
846a46043c Merge "Prevent getting data from Clipboard if device is locked" into oc-dev 2017-09-11 22:52:01 +00:00
Android Build Merger (Role)
1381563a19 Merge "Merge "AAPT2: Fix processing of quotes in XML" am: 9b65f03abf am: 9bf83b4cd1 am: 63c3aa9a45 am: 4aaf3b90cb" 2017-09-11 22:23:54 +00:00
Adam Lesinski
ffb5864295 Merge "AAPT2: Fix processing of quotes in XML" am: 9b65f03abf am: 9bf83b4cd1 am: 63c3aa9a45 
am: 4aaf3b90cb

Change-Id: Ia00829933d7e7a8b7e413c72ac7d2887266c7e8e
 2017-09-11 22:21:45 +00:00
Janis Danisevskis
c0b86675d3 Merge "Fix use of auth-bound keys after screen lock removal" 2017-09-11 22:20:31 +00:00
Adam Lesinski
5cfa88914f Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am: 8303fb42e0 am: 6cbee7a73c am: 4ad7c2dd29 
am: 08d8c8321b

Change-Id: I5b73c2852e5a4a85a2dbb0a0efb903f9df311fa6
 2017-09-11 22:17:54 +00:00
Kevin Chyn
a32525fcba Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev am: c6e9bb9da0 
am: 1540738d55

Change-Id: Ic39acd56e431f535b507d1a1aa1054d3cdfd3018
 2017-09-11 22:07:34 +00:00
Adam Lesinski
4aaf3b90cb Merge "AAPT2: Fix processing of quotes in XML" am: 9b65f03abf am: 9bf83b4cd1 
am: 63c3aa9a45

Change-Id: I8c691fdcbe58c5fe60f0a55ed710f266f51c3f25
 2017-09-11 22:06:19 +00:00
Chad Brubaker
e7454950f6 Merge "Expand and expose Lockdown global action" 2017-09-11 22:04:07 +00:00
TreeHugger Robot
516070f521 Merge "WebViewUpdateService.dumpState: print a line for each WebView package" 2017-09-11 22:02:44 +00:00
John Reck
91cf84cda2 Merge "Fix flicker from multiwindow resize" into oc-mr1-dev am: facdce3ab2 
am: a0c211120a

Change-Id: I701b817d0109c650069d445548280bec4193729d
 2017-09-11 22:00:02 +00:00
Adam Lesinski
63c3aa9a45 Merge "AAPT2: Fix processing of quotes in XML" am: 9b65f03abf 
am: 9bf83b4cd1

Change-Id: Ibed7a996aed00e6e5cfdee457c40277469a95ebf
 2017-09-11 21:59:04 +00:00
Adam Lesinski
08d8c8321b Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am: 8303fb42e0 am: 6cbee7a73c 
am: 4ad7c2dd29

Change-Id: I0cd56262c2b72dd48fa3c5263e60bee9feb65658
 2017-09-11 21:57:44 +00:00
Adam Lesinski
9bf83b4cd1 Merge "AAPT2: Fix processing of quotes in XML" 
am: 9b65f03abf

Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed
 2017-09-11 21:50:55 +00:00
Adam Lesinski
4ad7c2dd29 Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am: 8303fb42e0 
am: 6cbee7a73c

Change-Id: I10f38277b2bdc364ea5f8caba08475badac325f4
 2017-09-11 21:49:49 +00:00
Kevin Chyn
1540738d55 Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev 
am: c6e9bb9da0

Change-Id: Ib8e1512e06cc81ddf9e7f9beac1eef49d232ffc0
 2017-09-11 21:48:55 +00:00
Adam Lesinski
6cbee7a73c Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" 
am: 8303fb42e0

Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309
 2017-09-11 21:41:27 +00:00
Andreas Huber
3369f0da8e Remove unused global references in JNI code supporting HwBinder. 
Bug: 63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java
 2017-09-11 21:38:52 +00:00
Bryce Lee
5b21f521ff Make sure top activity is stopped on sleep if paused. 
Currently we have logic in place to handle moving a top resumed
activity to paused and eventually stopped if entering sleep. However,
we do not handle the case when the top activity is already paused.

This changelist addresses this issue by identifying this condition
and moving the activity to the stopped state.

Change-Id: Ib9fff1efeb33719d008508cf21a17b95fc17efd0
Fixes: 65457314
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
 2017-09-11 14:38:16 -07:00
John Reck
a0c211120a Merge "Fix flicker from multiwindow resize" into oc-mr1-dev 
am: facdce3ab2

Change-Id: I217c2db8adcb5b2b9ad2ffcd3226176c7e7c08c4
 2017-09-11 21:36:05 +00:00
Ping Sun
648ef4db4e Merge "Merge "Add ims registration status" am: d217a0c5a7 -s ours am: d850ce22f2 -s ours am: f27ccdbafa -s ours" into oc-mr1-dev-plus-aosp 
am: a2ff4ce0a0  -s ours

Change-Id: Iec956b4076993cf6f1ebdc9e175fb6c5e3d39eba
 2017-09-11 21:35:28 +00:00
Treehugger Robot
9b65f03abf Merge "AAPT2: Fix processing of quotes in XML" 2017-09-11 21:34:53 +00:00
Kevin Chyn
c6e9bb9da0 Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev 2017-09-11 21:33:32 +00:00