Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
368,970 Commits 3 Branches 0 Tags
3f7fd45e2bb04cedc2de2c281ffbb5b62ae6ec0f
Commit Graph

368970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Dupin
3f7fd45e2b Merge "Clock padding and motion adjustments" into pi-dev 
am: 96b4b4bd4e

Change-Id: I932fab6fe4d87fc55e3275b2ca0903fd6b34a34f
 2018-04-19 18:04:51 -07:00
Erik Kline
cf4967bfec [automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev 
am: dd08f4b96a  -s ours

Change-Id: Id8753d01a14d062baaeb313437b15f03161d1477
 2018-04-19 17:53:50 -07:00
Salvador Martinez
2ab853d940 Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev 
am: c2120a10f7

Change-Id: I06fddba7f72558bdc2b32fb768e550317264dbfe
 2018-04-19 17:45:51 -07:00
TreeHugger Robot
96b4b4bd4e Merge "Clock padding and motion adjustments" into pi-dev 2018-04-20 00:43:53 +00:00
TreeHugger Robot
dd08f4b96a Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev 2018-04-20 00:39:14 +00:00
Sanry Huang
82a4b03e6e Merge "Fix b/77867175: Clear all of NavigationPanel is missing" into pi-dev 
am: f0b7418f1b

Change-Id: I31ed361998a6824a54af7ba27c503263fdcc6e1e
 2018-04-19 17:21:11 -07:00
TreeHugger Robot
c2120a10f7 Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev 2018-04-20 00:15:45 +00:00
Jack He
107cbd78b3 Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev 
am: 6664f982a7

Change-Id: Id5dfb9bb2176d2117a4b4fb1477bc7e3009ddc2e
 2018-04-19 17:13:45 -07:00
Sanry Huang
f0b7418f1b Merge "Fix b/77867175: Clear all of NavigationPanel is missing" into pi-dev 2018-04-20 00:03:33 +00:00
Felipe Leme
76af91dddb Merge changes from topic "revert_save_info" into pi-dev 
am: 4dddd61fa8

Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d
 2018-04-19 16:55:11 -07:00
Amin Shaikh
1ee437e493 Merge "Update wifi enabled state when connected." into pi-dev 
am: 8a87e9ddd8

Change-Id: Iaf5108f48f89406a9c0371fdbc97f5ad81bda559
 2018-04-19 16:49:03 -07:00
Amin Shaikh
32966e2ae1 Merge "Allow QS expansion in switch access mode." into pi-dev 
am: caa429eada

Change-Id: I9282dd8321a5fb5c9149d6e4287882ae757e8620
 2018-04-19 16:44:08 -07:00
TreeHugger Robot
6664f982a7 Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev 2018-04-19 23:37:40 +00:00
TreeHugger Robot
4dddd61fa8 Merge changes from topic "revert_save_info" into pi-dev 
* changes:
  Document compatibility mode limitations.
  Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
 2018-04-19 23:32:46 +00:00
TreeHugger Robot
8a87e9ddd8 Merge "Update wifi enabled state when connected." into pi-dev 2018-04-19 23:30:08 +00:00
TreeHugger Robot
caa429eada Merge "Allow QS expansion in switch access mode." into pi-dev 2018-04-19 23:29:13 +00:00
Mike Digman
674271fe04 Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev 
am: 0b2f7503a8

Change-Id: I50fad5324559a37634a3f20dd7e40e9927e1feb4
 2018-04-19 15:57:46 -07:00
TreeHugger Robot
0b2f7503a8 Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev 2018-04-19 22:32:10 +00:00
Felipe Leme
9c05605f52 Document compatibility mode limitations. 
Test: mmm -j108 frameworks/base/:doc-comment-check-docs

Fixes: 77655074

Change-Id: I527d882850442c7e6e9379b1b423673885e07f2b
 2018-04-19 15:26:48 -07:00
Felipe Leme
a7f3e9c7cb Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode." 
Save has many limitations on compat mode, so we better not change the SaveInfo
behavior but rather document then.

This reverts commit 4f74a018c8.

Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest

Bug: 77655074

Change-Id: I36bd28ca546dcedefe75de7815b76b8b5827aee3
 2018-04-19 15:25:49 -07:00
Abodunrinwa Toki
10fa03ab38 Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev 
am: 993890fbf4

Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7
 2018-04-19 15:20:09 -07:00
Stanley Tng
a26906364e Cleanup documentation for LE CoC in BluetoothAdapter 
am: 0d5aa574d6

Change-Id: I73a3fd4d9c8dd908ca38f3b9877cafaf7847ff09
 2018-04-19 15:12:57 -07:00
Stanley Tng
bf97542258 Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev 
am: fb4da73e76

Change-Id: Ib28fec7dc7ee25de883569c054012a75fd1043f2
 2018-04-19 15:09:04 -07:00
Abodunrinwa Toki
993890fbf4 Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev 2018-04-19 22:05:17 +00:00
Jack He
f05e516f1d AudioService: Add warning log when handleDeviceConnection failed 
Bug: 78284878
Test: make, no functional change
Change-Id: I3c0b90afe8f345fa63812a1f91350baccb59516e
 2018-04-19 15:03:43 -07:00
Ryan Mitchell
e9bbefa7dc Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev 
am: 247ecfa498

Change-Id: I507b421d60294ea9262d5be579f22fdc2892c7fe
 2018-04-19 14:58:17 -07:00
Stanley Tng
0d5aa574d6 Cleanup documentation for LE CoC in BluetoothAdapter 
Test: Compile
Bug: 77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
(cherry picked from commit dac8e14018)
 2018-04-19 21:57:09 +00:00
Stanley Tng
fb4da73e76 Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev 2018-04-19 21:56:38 +00:00
Ryan Mitchell
247ecfa498 Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev 2018-04-19 21:35:59 +00:00
Eugene Susla
52489dbf66 Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev 
am: bb35e9e0e9

Change-Id: Icd60c59691d8a563a5e47cd56c9b677df708beb9
 2018-04-19 14:24:07 -07:00
TreeHugger Robot
bb35e9e0e9 Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev 2018-04-19 21:11:57 +00:00
Android Build Merger (Role)
acc6c95718 Merge "Merge "Fix channels --stats dump" into pi-dev am: 5de9459c81" into pi-dev-plus-aosp 2018-04-19 21:07:09 +00:00
Julia Reynolds
7349fa69bc Merge "Fix channels --stats dump" into pi-dev 
am: 5de9459c81

Change-Id: I56f1641dbd0f3180fbce8f88b2571be43dcc68a0
 2018-04-19 14:06:38 -07:00
Cassie Han
cee51971b8 [automerger skipped] Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" am: 122a7b33ad 
am: 0036df97ca  -s ours

Change-Id: Ie27e541ed60edc43f518f041f7200d29612677c5
 2018-04-19 14:04:53 -07:00
TreeHugger Robot
5de9459c81 Merge "Fix channels --stats dump" into pi-dev 2018-04-19 20:55:49 +00:00
Cassie Han
0036df97ca Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" 
am: 122a7b33ad

Change-Id: I5acb34ef6d16fd5eab73951811d220049b60a988
 2018-04-19 13:54:12 -07:00
Mike Ma
7351e73b96 Merge "Fix screen on count text dump" into pi-dev 
am: dd61c7e8e7

Change-Id: Ia2072936a3c02516a4f3add73895ee8e291cdc04
 2018-04-19 13:29:13 -07:00
Evan Rosky
48cca289df Merge "Don't crash during layout of non-attached but focused view" into pi-dev 
am: 62bb0802f9

Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465
 2018-04-19 13:24:41 -07:00
TreeHugger Robot
dd61c7e8e7 Merge "Fix screen on count text dump" into pi-dev 2018-04-19 20:16:28 +00:00
TreeHugger Robot
62bb0802f9 Merge "Don't crash during layout of non-attached but focused view" into pi-dev 2018-04-19 20:13:32 +00:00
Julia Reynolds
ad23a8021d Fix channels --stats dump 
Test: manual inspection
Bug: 78292990
Change-Id: Iab75627494213870184e503bc2585cc8644ca1dd
 2018-04-19 15:50:31 -04:00
Cassie Han
122a7b33ad Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" 2018-04-19 19:23:58 +00:00
Abodunrinwa Toki
904a931cfc Fix non-unique PendingIntent issue with TCImpl. 
As per the referenced bug, we're running into issues where apps are
being fired with stale intents. The reason is because we need intents we
fire to be unique by Intent.filterEquals. Some of the intents we
generate put unique data in the intent extra which is not considered by
filterEquals. The solution here is to create PendingIntents with unique
request codes (using classifiedText.hashCode()).
See more info about this in
https://developer.android.com/reference/android/app/PendingIntent.html

Bug: 77930684
Test: manually tested broken scenarios. See referenced bug
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Change-Id: Ib7275f94ca5ada51e4ba191742d4b614df12e1ea
 2018-04-19 18:23:51 +00:00
Chong Zhang
cadb0d5ec8 Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev 
am: 3f8884829f

Change-Id: Ib1cc2013127f59af33482c4924faa869b3cb7fb9
 2018-04-19 11:22:34 -07:00
Mike Digman
9b50b76700 Reset sticky navbar timeout when rotate btn shown 
First revealing the navbar and then rotating in an
immersive sticky activity makes the rotate navbar button
hard to tap. Signal to the navbar to reset sticky hiding
timeouts if the button becomes visible or changes.

Change-Id: I381bbfd2e0192465b8358bedd213f23dde8ec982
Fixes: 78248328
Test: manual testing with custom immersive sticky activity
 2018-04-19 10:57:49 -07:00
Makoto Onuki
5bb2f9b14d Merge "SyncManager: Dump per-source last sync time too." into pi-dev 
am: d329ae8010

Change-Id: Ib57bb1dd5433de157d38c86d8054b7821bf05d54
 2018-04-19 10:53:38 -07:00
Makoto Onuki
c7ed7f0074 Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev 
am: dbdf5df96e

Change-Id: I74e57f9cd0fc051f4308df48535f3dce22f3908b
 2018-04-19 10:46:50 -07:00
TreeHugger Robot
3f8884829f Merge "Adjust media.codec process group upon request from mediaserver" into pi-dev 2018-04-19 17:40:39 +00:00
Makoto Onuki
d329ae8010 Merge "SyncManager: Dump per-source last sync time too." into pi-dev 2018-04-19 17:37:45 +00:00
Beverly
ab334fd6f6 Merge "Update notification shade text on zen change" into pi-dev 
am: 7468d361e3

Change-Id: I486f4d5500e01570255af814bf53cf5e42ca9c06
 2018-04-19 10:29:23 -07:00