Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
330,465 Commits 3 Branches 0 Tags
d2fa9c3ecf3110cf64fcb62682f2e8f2a3d04d1e
Commit Graph

8211 Commits

Author SHA1 Message Date
Steve Elliott
d2fa9c3ecf DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev 
Bug: 111603898
Test: manual
Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8
 2018-10-31 16:29:12 +00:00
Steve Elliott
77c1f60801 DO NOT MERGE: Add configurable default setting for assistant componentname 
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
 2018-10-19 20:11:08 +00:00
Alan Viverette
5811482acf Merge changes from topic "viewpager_state" into oc-dev 
am: 77edd5fabe

Change-Id: Ic624154d57c8b7398d60c470bd285de35f2499af
 2018-03-09 20:15:45 +00:00
Alan Viverette
77edd5fabe Merge changes from topic "viewpager_state" into oc-dev 
* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version
 2018-03-09 18:43:02 +00:00
Fyodor Kupolov
bdc573b39b Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev 
am: b6b6c01847

Change-Id: I3bd011083894e1db22b90d38d71a0807facd151f
 2018-03-08 20:54:39 +00:00
Android Build Merger (Role)
286944d5c9 [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 am: 3a295c1c7f 
Change-Id: I720535127956baa76dc6dbad42b9ec92a819916f
 2018-02-21 20:27:16 +00:00
Android Build Merger (Role)
3a295c1c7f [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 
Change-Id: I1d42aa3bea943a1564741443fb7db3ec98583fe3
 2018-02-21 20:27:11 +00:00
Android Build Merger (Role)
fa32631c63 [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e 
Change-Id: Ib60d63bcc8769f10a64753f7fccf07c103b35c09
 2018-02-21 20:27:06 +00:00
Android Build Merger (Role)
e0b5c2d25e [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb 
Change-Id: I5fb0625286289c43644612528d25fb3f90f6ec7b
 2018-02-21 20:27:01 +00:00
Android Build Merger (Role)
71478241eb [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 
Change-Id: If09aad1fa86dbc5c6223d06f67b81d45660ca2d3
 2018-02-21 20:26:56 +00:00
Fyodor Kupolov
3b8bc2e450 Verify last array's length in readFromParcel 
Length of the last array in readFromParcel should be the same as
value of mNextIndex.

Test: PoC app in the bug
Bug: 73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5
 2018-02-21 20:26:52 +00:00
Android Build Merger (Role)
705e28e26b [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412 
Change-Id: I5217e675455809ee18c9a0b06bb3b740d01c09f8
 2018-02-16 19:46:21 +00:00
Android Build Merger (Role)
b3e984c412 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 
Change-Id: I65d895c9ea8506227ad5ba7c77d44827b0cd80fe
 2018-02-16 19:46:15 +00:00
Android Build Merger (Role)
d04ccc6608 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df 
Change-Id: Iedd1e0502ac237920b24cac81a2540cfcf4c8d87
 2018-02-16 19:46:09 +00:00
Android Build Merger (Role)
aebf5c06df [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c 
Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56
 2018-02-16 19:46:03 +00:00
Android Build Merger (Role)
c42091667c [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 
Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c
 2018-02-16 19:45:57 +00:00
Android Build Merger (Role)
bc42f76941 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 
Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93
 2018-02-16 19:45:41 +00:00
Android Build Merger (Role)
cb362192e8 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 
Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef
 2018-02-16 19:45:36 +00:00
Android Build Merger (Role)
fece305de0 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 
Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348
 2018-02-16 19:45:30 +00:00
Android Build Merger (Role)
4c24e4d831 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 
Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8
 2018-02-16 19:45:24 +00:00
Alan Viverette
187964aca1 Update internal ViewPager's SavedState to match Support Library version 
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual
 2018-02-16 14:45:05 -05:00
Rubin Xu
7ac2108ed3 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 
am: bf1ecab901

Change-Id: Ibf8e444ab8e66a068174c30985e3056443db99fe
 2018-02-07 21:59:55 +00:00
Android Build Merger (Role)
bf1ecab901 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
 2018-02-07 08:19:03 +00:00
Android Build Merger (Role)
469065ccb7 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
 2018-02-07 08:18:57 +00:00
Android Build Merger (Role)
f097744926 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
 2018-02-07 08:18:50 +00:00
Android Build Merger (Role)
4af59f1c97 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
 2018-02-07 08:18:44 +00:00
Android Build Merger (Role)
ab36ba8483 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
 2018-02-07 08:18:37 +00:00
Android Build Merger (Role)
b3012285e2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
 2018-02-07 08:18:22 +00:00
Android Build Merger (Role)
4405b0ced2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f 
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
 2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d 
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
 2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
 2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888 Fix VerifyCredentialResponse parcelling code 
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
 2018-02-07 08:17:06 +00:00
Christine Franks
cf74d28888 Support native and srgb for night display 
Bug: 68159303
Test: make -j100

Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
 2017-10-26 13:22:46 -07:00
Michael Plass
02d802e71e DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result 
Bug: 62866191
Bug: 63074860
Bug: 65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
(cherry picked from commit 9c1d56576e)
 2017-09-01 09:42:27 -07:00
Baligh Uddin
230c78cec5 DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" 
Bug: 64864568

This reverts commit fd35d7c0a2, reversing
changes made to 07a21754f4.
 2017-08-19 15:49:05 -07:00
Julia Reynolds
c23a2e67ac Let the foreground service channel be blocked 
And update the channel name

Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes: 36891897
Test: manual
 2017-08-17 14:11:45 -04:00
TreeHugger Robot
8cbb5ffd5b Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev 2017-08-09 17:31:48 +00:00
Christofer Åkersten
fb09ecfdd7 Inherit theme dark/light scheme for MediaRouter dialogs/button 
Bug: 64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
Merged-In: I20694ce512a794a3c6574108b80dcfb4979b3b39
 2017-08-09 16:28:50 +09:00
Andrew Sapperstein
5a71a0f520 Make accessibilityInversionEnabled public 
Need to use it in Settings.

Bug: 64256644
Test: existing
Change-Id: I9f9d2655e35ee2ad0dc9f9980cc9993f7b084025
 2017-08-08 13:57:49 -07:00
Jason Monk
b4302182bc Move shutdown UI to sysui (when possible) 
Test: click restart or power off in global actions
Change-Id: I0dc30a9772bbfb3cd3c3568f157e854fef87bf87
Fixes: 63576195
Fixes: 64125291
 2017-08-08 09:13:51 -04:00
Amith Yamasani
5a800cf069 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev 2017-08-03 23:07:32 +00:00
Lucas Dupin
26fb43c034 Multi-user and WallpaperColors 
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
 2017-08-02 23:18:26 +00:00
Geoffrey Pitsch
3ba2623ffe Disable AOD when accessibility color inversion is on. 
White background drains too much to be always on.

Bug: 62918778
Test: Manual
Change-Id: I78b2f6a5951b108aff4f353dabe2493117032dce
 2017-07-31 13:55:59 -04:00
Lucas Dupin
9324aa926a Scrim opacity must satisfy GAR 
Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java
 2017-07-28 10:07:04 -07:00
Lucas Dupin
8a4522dceb Add theme variables to SysUI dump 
Dumping current themes and scrim states to make debugging easier.

Bug: 63890571
Test: adb bugreport # look for new variables
Change-Id: Ia9bfd1b91d8d2c19930cb896d337ecdfa776e6cb
 2017-07-26 21:48:06 -07:00
Michael Plass
9c1d56576e [AsyncChannel] Fix race in handling of sync result 
Bug: 62866191
Bug: 63074860
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
 2017-07-26 21:44:31 +00:00
Amith Yamasani
fd3caf6a7d Ignore isolated uid's process state in BatteryStats tracking 
Isolated UIDs keep coming and going, with their process states
being downgraded. But this shouldn't impact the process state
time tracking in battery stats, since the parent UIDs process state
reflects the overall state already.

This fixes incorrect TOP time reporting in Settings for apps like
Chrome.

Change-Id: I0e94b064cd19f1f2d951e1e88aaba06b5c1c26fe
Fixes: 62162308
Test: Use chrome for a while and observe output of dumpsys batterystats
 2017-07-26 11:48:35 -07:00
Selim Cinek
e06e3f97fc Merge "Changing the way the media image scales" into oc-dr1-dev 2017-07-25 22:45:55 +00:00
TreeHugger Robot
a1f64b0a91 Merge "Fix jank when switching themes" into oc-dr1-dev 2017-07-25 17:40:02 +00:00
Ajay Panicker
aaf3860941 Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev 2017-07-25 02:11:26 +00:00