Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
471,983 Commits 3 Branches 0 Tags
98913bf11d3bdf2fa6aaf576d807dc342c466fc6
Commit Graph

471983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
98913bf11d [automerger skipped] Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07e9 am: 2b082ce78f -s ours 
am skip reason: Change-Id Ie4b827563dbc373c58ec805bc5400e0950b5b81e with SHA-1 5dbd3c3b69 is in history

Change-Id: Ica543e0bec0aa44850a7e0bcd3fe172955d781d6
 2020-03-12 01:33:03 +00:00
Automerger Merge Worker
2b082ce78f Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07e9 
Change-Id: Ifbe8ce193c55fea9298558f7df4b63ee654ce10b
 2020-03-12 01:21:39 +00:00
Daniel Bright
774efe07e9 Merge "Undo commit "Expose constants in Telephony.Carriers"" 2020-03-12 01:07:30 +00:00
Daniel Bright
9fe427c9d2 Undo commit "Expose constants in Telephony.Carriers" 
Undid carrier constants as @SystemApis.  Also had to move
constants out of annotation.java because any references in
that specific file need to be to public APIs.

Bug: 148170690
Test: make, flash
Merged-In: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
 2020-03-11 16:54:08 -07:00
Automerger Merge Worker
bc3d825f33 Merge "Tuner JNI: split dvr to DvrRecord & DvrPlayback" into rvc-dev am: fb60f4e159 
Change-Id: I7307ec0bb34e25c03d6fcda88755b6b3460696c5
 2020-03-11 23:12:44 +00:00
TreeHugger Robot
fb60f4e159 Merge "Tuner JNI: split dvr to DvrRecord & DvrPlayback" into rvc-dev 2020-03-11 23:08:30 +00:00
Automerger Merge Worker
17f8c329d3 Merge "Null-check notif chan when ident people notifs" into rvc-dev am: b687bc21e1 
Change-Id: I69a2a687b7e974e5f0165d3d395378536ce65fa4
 2020-03-11 23:06:52 +00:00
TreeHugger Robot
b687bc21e1 Merge "Null-check notif chan when ident people notifs" into rvc-dev 2020-03-11 22:58:22 +00:00
Automerger Merge Worker
deefb517d5 Merge "Controls UI - Better structure/app switching" into rvc-dev am: 1c31514ade 
Change-Id: Ib32a9e1bd24d7195d295f9e6a0ed5b2d06f4461f
 2020-03-11 22:10:22 +00:00
TreeHugger Robot
1c31514ade Merge "Controls UI - Better structure/app switching" into rvc-dev 2020-03-11 22:04:57 +00:00
Automerger Merge Worker
22c79f5dfe Merge "WindowContext: Add @WindowType intdef" into rvc-dev am: 76b221c84b 
Change-Id: I221caa253b84661cff94ad5e037b91718a82119f
 2020-03-11 22:03:28 +00:00
TreeHugger Robot
76b221c84b Merge "WindowContext: Add @WindowType intdef" into rvc-dev 2020-03-11 22:02:27 +00:00
Automerger Merge Worker
dcac5e51f8 Merge "Remove API getDefaultSimCountryIso() as per API council feedback" into rvc-dev am: dd3768ed8c 
Change-Id: Ie22250523b19cbd06a73467c0b3dbb509d56fa9c
 2020-03-11 21:59:09 +00:00
Automerger Merge Worker
5b5d16db31 Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e281 
Change-Id: Ibdf6cc5f79dfccbcc52581f03376c2ddd1aa15ae
 2020-03-11 21:59:00 +00:00
Automerger Merge Worker
03678599df Merge "add permission requirement for java writeData method" into rvc-dev am: 27c83fce04 
Change-Id: Ide679280b9f396f3799bef7a4a5f4f8cbf10eb0e
 2020-03-11 21:58:44 +00:00
Automerger Merge Worker
639236dbef Merge "Temporary fix to disable augmented autofill requests coming from password fields." into rvc-dev am: f5589a71e0 
Change-Id: Ideee298349bbf1ef436a758b29bc7e3d7c599ab8
 2020-03-11 21:58:23 +00:00
Jayachandran Chinnakkannu
dd3768ed8c Merge "Remove API getDefaultSimCountryIso() as per API council feedback" into rvc-dev 2020-03-11 21:53:08 +00:00
TreeHugger Robot
49f0b3e281 Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev 
* changes:
  Don't allow the overflow bubble to be dragged out.
  Fix inability to return to selected bubble after opening overflow.
 2020-03-11 21:51:42 +00:00
TreeHugger Robot
27c83fce04 Merge "add permission requirement for java writeData method" into rvc-dev 2020-03-11 21:49:27 +00:00
TreeHugger Robot
f5589a71e0 Merge "Temporary fix to disable augmented autofill requests coming from password fields." into rvc-dev 2020-03-11 21:43:58 +00:00
Automerger Merge Worker
16f0237380 Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev am: 5a563d2870 
Change-Id: I13000ceb727b0fe13bd0f9f66699447553b3c534
 2020-03-11 21:00:17 +00:00
Automerger Merge Worker
30014d1c81 Merge "Don't apply ime adjustments/dims if split is not active" into rvc-dev am: dcb631d551 
Change-Id: I7beb970a3df49b903a070c560dd8cab8f8e233ff
 2020-03-11 20:59:54 +00:00
Automerger Merge Worker
8b40b79ed8 Merge "change getActiveAndHiddenSubscriptionInfoList API name" into rvc-dev am: 8ca61d7cd3 
Change-Id: I193d7141bcf251d48cf03ad320cd871bd53ec2d8
 2020-03-11 20:59:26 +00:00
Automerger Merge Worker
502f717041 Merge "READ_PHONE_STATE permission for isModemEnabledForSlot" into rvc-dev am: b6e24590fd 
Change-Id: Ib32c0cfa46a53ddcd8389a40f266f47e627ccca4
 2020-03-11 20:58:45 +00:00
Kevin Chyn
5a563d2870 Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev 2020-03-11 20:56:42 +00:00
TreeHugger Robot
dcb631d551 Merge "Don't apply ime adjustments/dims if split is not active" into rvc-dev 2020-03-11 20:55:17 +00:00
TreeHugger Robot
8ca61d7cd3 Merge "change getActiveAndHiddenSubscriptionInfoList API name" into rvc-dev 2020-03-11 20:54:07 +00:00
TreeHugger Robot
b6e24590fd Merge "READ_PHONE_STATE permission for isModemEnabledForSlot" into rvc-dev 2020-03-11 20:50:15 +00:00
Automerger Merge Worker
5b0e336711 Merge "Regenerate LocaleDataTables.cpp wtih Unicode 13 update" am: 49d765ee67 am: 9e9298aff7 
Change-Id: If58f2b7f55d3a8365d73d62c96b22236d3cf85ce
 2020-03-11 20:33:58 +00:00
Automerger Merge Worker
e44c7739db [automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" am: af0d638e98 -s ours am: b9157581bc -s ours 
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 1f324f6960 is in history

Change-Id: I8e815d0d7867c99254f834bb361aa361c106ef74
 2020-03-11 20:33:48 +00:00
Automerger Merge Worker
9411862394 [automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" am: c3e4dd3799 -s ours am: 59e1336bb4 -s ours 
am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 75c49ab334 is in history

Change-Id: I9dde21a78ffa268c83395cd2dffe784874aa87df
 2020-03-11 20:33:33 +00:00
Automerger Merge Worker
4a22155131 [automerger skipped] Merge "API Council Feedbacks" am: e03edaba0e -s ours am: 34e7fd4114 -s ours 
am skip reason: Change-Id Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754 with SHA-1 9ae1afee27 is in history

Change-Id: I4a1a9ca301b32cb112ff325c50786c3eb5bcdf2e
 2020-03-11 20:33:14 +00:00
Automerger Merge Worker
18d24d5e66 [automerger skipped] Merge "Allow key downgrade during staged install of apex packages" am: 3a290c6bc0 -s ours am: 388136b49b -s ours 
am skip reason: Change-Id I0c0e6eaee65a6c77f62425c3929ffa805d1e0f47 with SHA-1 8e35db194f is in history

Change-Id: I3ce973195c2bd46499d1d264a208a1eff3564d83
 2020-03-11 20:32:59 +00:00
Automerger Merge Worker
e450064946 Merge "SystemUI: Disable heads up debugging on user builds" am: 6bb11e48ec am: 454c145b6f 
Change-Id: I6c0b7019c89a348ddfd739107a8acb78584dc238
 2020-03-11 20:32:41 +00:00
Automerger Merge Worker
61c63c35f4 Regenerate LocaleDataTables.cpp wtih Unicode 13 update am: 7ea3b2164d am: 92ea9b82fc 
Change-Id: I244c9ab135705cafbc492d5d98d238eb31168ac7
 2020-03-11 20:32:14 +00:00
Automerger Merge Worker
651420f215 Merge "NfcTile: Update style to match current UI" am: 2c4007641b am: f27ff68d8c 
Change-Id: I88088dbfceb471f4a52c64bc993cba676c020aeb
 2020-03-11 20:31:57 +00:00
Automerger Merge Worker
efd5aca7e0 [automerger skipped] Add updateMccMncConfiguration as @TestApi for CTS am: a14185aad4 am: bd96ea2511 -s ours 
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 1f324f6960 is in history

Change-Id: I5792fdd5672f72ec738a6b505f75be7e035b8c20
 2020-03-11 20:31:36 +00:00
Automerger Merge Worker
4deb3e6c11 [automerger skipped] API Council Feedback - Override EmergencyNumberDB File API am: a1c74497cd am: ba0ef8c9c6 -s ours 
am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 75c49ab334 is in history

Change-Id: I801683a65f43fa9cf7c73f561ff2a4b13f32a478
 2020-03-11 20:31:21 +00:00
Automerger Merge Worker
2b25119612 Merge "Fix CallRedirectionService Doc issue" am: ed90e72dde am: 6051bfbc91 
Change-Id: Idbbd1a6ac8c7836deaab18d6a061aa4efa2b40cc
 2020-03-11 20:30:56 +00:00
Automerger Merge Worker
194617d2bd API Council Feedbacks am: 9ae1afee27 am: f4ed9f5712 
Change-Id: Ic810a7987e48c8bedef924299fc485dcfa78a492
 2020-03-11 20:30:16 +00:00
Automerger Merge Worker
849bd64459 [automerger skipped] Allow key downgrade during staged install of apex packages am: 16618cd836 am: ad63b613a4 -s ours 
am skip reason: Change-Id I0c0e6eaee65a6c77f62425c3929ffa805d1e0f47 with SHA-1 8e35db194f is in history

Change-Id: I5f14ef74cf001218d5ad631fa97dc9b4e6c55d89
 2020-03-11 20:29:30 +00:00
Automerger Merge Worker
9e9298aff7 Merge "Regenerate LocaleDataTables.cpp wtih Unicode 13 update" am: 49d765ee67 
Change-Id: I34f1fad20335958b2183ad058ae0c8b5edd888f9
 2020-03-11 20:27:31 +00:00
Automerger Merge Worker
b9157581bc [automerger skipped] Merge "Add updateMccMncConfiguration as @TestApi for CTS" am: af0d638e98 -s ours 
am skip reason: Change-Id I63288be1acd9e898548ced345799ac1ae69ce427 with SHA-1 a14185aad4 is in history

Change-Id: Idf8af8819a7be3171a53ca5aea4e33737f0f3e64
 2020-03-11 20:27:14 +00:00
Automerger Merge Worker
59e1336bb4 [automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" am: c3e4dd3799 -s ours 
am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 a1c74497cd is in history

Change-Id: I41ced87aa1e7e6a3ddbbe0c173daf9b9af593745
 2020-03-11 20:26:59 +00:00
Automerger Merge Worker
34e7fd4114 [automerger skipped] Merge "API Council Feedbacks" am: e03edaba0e -s ours 
am skip reason: Change-Id Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754 with SHA-1 9ae1afee27 is in history

Change-Id: Ie8cfcb55fef07a1778eb76b288306311c903d18a
 2020-03-11 20:26:37 +00:00
Automerger Merge Worker
388136b49b [automerger skipped] Merge "Allow key downgrade during staged install of apex packages" am: 3a290c6bc0 -s ours 
am skip reason: Change-Id I0c0e6eaee65a6c77f62425c3929ffa805d1e0f47 with SHA-1 16618cd836 is in history

Change-Id: I571d16ac5f021a45f5711f39ee478db7edcaedbe
 2020-03-11 20:26:02 +00:00
Automerger Merge Worker
454c145b6f Merge "SystemUI: Disable heads up debugging on user builds" am: 6bb11e48ec 
Change-Id: I4e385793e8829bf819ec589883216e98711b9443
 2020-03-11 20:24:55 +00:00
Automerger Merge Worker
92ea9b82fc Regenerate LocaleDataTables.cpp wtih Unicode 13 update am: 7ea3b2164d 
Change-Id: Idb9c84e3a88ab3950fbb35925377cffe44bb8767
 2020-03-11 20:24:29 +00:00
Automerger Merge Worker
f27ff68d8c Merge "NfcTile: Update style to match current UI" am: 2c4007641b 
Change-Id: Ia971357809197ca87e20e26cf8cb1c03edbfc657
 2020-03-11 20:22:52 +00:00
Automerger Merge Worker
6493c11455 [automerger skipped] [DO NOT MERGE] Allows the Assistant to request suppression of fling am: ace57ca0df -s ours am: 2c881167ae 
Change-Id: If218e7b6be353fb1bf0d2e572ce6bd077df3f12d
 2020-03-11 20:18:39 +00:00