Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
473,733 Commits 3 Branches 0 Tags
4eb9055caadc19cf31c757b3b5c5df1e7f45c2ce
Commit Graph

473733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
4eb9055caa Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev am: 210bccd974 
Change-Id: I2c0bede3ca5f77c0af64897215443bb23101ac00
 2020-03-18 19:58:10 +00:00
Jeffrey Huang
a846cf462f Merge "Migrate statsd_test to use libstatslog_statsdtest" into rvc-dev am: 4980c0a6cf 
Change-Id: Ia89443ce35a3bc89965c9d548787cdd941a8f5bf
 2020-03-18 19:57:37 +00:00
Oscar Shu
c6b05fcb00 [automerger skipped] Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev am: 5e52236bcc -s ours am: 0527108a06 -s ours 
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 86a84576b5 is in history

Change-Id: I06b2f665ed476fa4ad4eea58334bcca319521b62
 2020-03-18 19:57:30 +00:00
Cody Kesting
3f0d6c7efd Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: 93b97bd690 
Change-Id: I7bb08844a95fcae66f84a2756b6a06184c74733e
 2020-03-18 19:57:19 +00:00
TreeHugger Robot
7a01fc0092 Merge "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED." into rvc-dev am: 8562620d8a 
Change-Id: Id0ea0363690d189962b4debbc41c5360d449843e
 2020-03-18 19:57:00 +00:00
Cody Kesting
8c78e55488 Change NetworkCapabilities administrator UIDs to be stored as int[]. am: f7ac996fb5 
Change-Id: I26343fa85d936aa71dbe983341343fd1d74a7a0a
 2020-03-18 19:56:33 +00:00
Sarah Chin
210bccd974 Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev 2020-03-18 19:52:26 +00:00
Jeffrey Huang
4980c0a6cf Merge "Migrate statsd_test to use libstatslog_statsdtest" into rvc-dev 2020-03-18 19:47:14 +00:00
Amit Mahajan
86baf0e5bd Merge changes from topic "Remove telephony protection level" into rvc-dev am: 0ed16d7b4b 
Change-Id: If4e18fe057a500863cbd62db7bcd68be05bd0d6d
 2020-03-18 19:42:35 +00:00
Amit Mahajan
f708228893 Revert "Allowed telephony to bind network service" am: e1e739deb4 
Change-Id: I66c65def199be360882c04871474f7a18db96e12
 2020-03-18 19:42:29 +00:00
Amit Mahajan
2d95f248c7 Revert "add telephony role to some permissions needed by telephony module" am: 2953dafed7 
Change-Id: Iec59b6217669a50bab8179d5b4dfc7b232a8c111
 2020-03-18 19:42:26 +00:00
Oscar Shu
0527108a06 [automerger skipped] Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev am: 5e52236bcc -s ours 
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 86a84576b5 is in history

Change-Id: I5d733e6310c464fbe42bed4dfca4b759eeddfc13
 2020-03-18 19:41:24 +00:00
Cody Kesting
93b97bd690 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev 2020-03-18 19:40:39 +00:00
TreeHugger Robot
8562620d8a Merge "Un-expose ACTION_SERVICE_PROVIDERS_UPDATED." into rvc-dev 2020-03-18 19:31:38 +00:00
Oscar Shu
5e52236bcc Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev 2020-03-18 19:26:50 +00:00
Amit Mahajan
0ed16d7b4b Merge changes from topic "Remove telephony protection level" into rvc-dev 
* changes:
  Remove telephony protection level.
  Revert "Allowed telephony to bind network service"
  Revert "add telephony role to some permissions needed by telephony module"
 2020-03-18 19:22:36 +00:00
Andrei Litvin
6a599cb316 Merge "Merge "Set owners for the tv remote service aidl files." am: 5b5bd31eb3 am: a302148032 am: 7098dee8da am: cf723c35d4 am: df27d42493" into rvc-dev am: d138fb0ff2 
Change-Id: I18e0493073c30b403d749f07569e55d01003b630
 2020-03-18 19:15:56 +00:00
TreeHugger Robot
ef323fed47 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e8f08872c2 -s ours am: 7e606fdf97 -s ours 
am skip reason: subject contains skip directive

Change-Id: I345f8ab0f16e4168b42b859f349e9551e7e4fbf7
 2020-03-18 19:15:48 +00:00
Evan Laird
e319d744fd [automerger skipped] Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev am: 27a0ee31b6 -s ours am: a12e7d94fa 
Change-Id: Ieac86776e5b08f82d2a8f615daaa966c084a38de
 2020-03-18 19:15:40 +00:00
Andrei Litvin
d138fb0ff2 Merge "Merge "Set owners for the tv remote service aidl files." am: 5b5bd31eb3 am: a302148032 am: 7098dee8da am: cf723c35d4 am: df27d42493" into rvc-dev 2020-03-18 19:05:18 +00:00
TreeHugger Robot
7e606fdf97 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e8f08872c2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I99730ebec24eb59868db7ff87d199e2f1bf94dd7
 2020-03-18 19:03:09 +00:00
Evan Laird
a12e7d94fa [automerger skipped] Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev am: 27a0ee31b6 -s ours 
am skip reason: subject contains skip directive

Change-Id: I93a42e4c6e6922679ec6b92105f9206a5d07c1de
 2020-03-18 19:02:55 +00:00
TreeHugger Robot
e8f08872c2 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-03-18 19:01:41 +00:00
Rubin Xu
070d6ce897 Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev am: 243c57f079 
Change-Id: I5e8aa9eeaa2c14fe745eca98fa396d017e293507
 2020-03-18 18:46:28 +00:00
Rubin Xu
243c57f079 Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev 2020-03-18 18:42:28 +00:00
Rubin Xu
e6d99f13c5 Merge "Do not crash if attempt to launch app from locked profile" into rvc-dev am: 763285e574 
Change-Id: I675c61e525963c6d04e37dc34304e11f1c99f90c
 2020-03-18 18:41:51 +00:00
Victor Hsieh
d3c37d3efd Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am: 0af18474b3 
Change-Id: I6cb612ee08887a9f63f0a3f5d73c3387e69f4b6a
 2020-03-18 18:41:33 +00:00
Santiago Seifert
537294488f Merge "Fix javadoc which was broken with renames" into rvc-dev am: a7dae49707 
Change-Id: Ieee43025f13977faef7e5d607c038a7ecf8e970b
 2020-03-18 18:41:12 +00:00
TreeHugger Robot
1b8e2148dc Merge "Camera: clarify offline processing spec" into rvc-dev am: 9b7197fb11 
Change-Id: I109793056edbfbf40b7b315952c3fb2b3e48cbf8
 2020-03-18 18:40:36 +00:00
Evan Laird
27a0ee31b6 Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev 2020-03-18 18:37:56 +00:00
Rubin Xu
763285e574 Merge "Do not crash if attempt to launch app from locked profile" into rvc-dev 2020-03-18 18:36:06 +00:00
Victor Hsieh
0af18474b3 Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev 2020-03-18 18:35:33 +00:00
Santiago Seifert
a7dae49707 Merge "Fix javadoc which was broken with renames" into rvc-dev 2020-03-18 18:31:39 +00:00
TreeHugger Robot
9b7197fb11 Merge "Camera: clarify offline processing spec" into rvc-dev 2020-03-18 18:25:36 +00:00
Anna Trostanetski
b4a028b7b7 Merge "Introduce listUIChanges API for developer UI" into rvc-dev am: 6b408f801a 
Change-Id: Ia360cfc1f7a4a8ad168275f8ba715fd5c27abdbf
 2020-03-18 18:18:29 +00:00
Anna Trostanetski
6b408f801a Merge "Introduce listUIChanges API for developer UI" into rvc-dev 2020-03-18 18:15:51 +00:00
TreeHugger Robot
df73e3f224 Merge "BLASTSyncEngine: Disable overlapping calls to a single container" into rvc-dev am: 3a18890eac 
Change-Id: Ia627bb5bb2bc35531833afafddb18412408200e8
 2020-03-18 18:12:55 +00:00
Sarah Chin
b06e5c51c7 Merge "Move getMsisdn and getLine1Number to READ_PHONE_NUMBERS" into rvc-dev am: 2b004fa8e8 
Change-Id: I4d4a238ba2e97d38543bfc11bd69e0be802f0d3f
 2020-03-18 18:12:15 +00:00
Santiago Seifert
c580d458c3 Fix javadoc which was broken with renames 
Bug: 150855597
Test: Not applicable.
Change-Id: I3f168736b612d65000d94314665b50c82adaa7f5
 2020-03-18 18:09:43 +00:00
Bill Yi
fe51ff5cd6 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ib4eae9455e15c5fab4095a0f6eafc69101d3a3f9
 2020-03-18 11:08:13 -07:00
TreeHugger Robot
3a18890eac Merge "BLASTSyncEngine: Disable overlapping calls to a single container" into rvc-dev 2020-03-18 18:07:13 +00:00
Sarah Chin
2b004fa8e8 Merge "Move getMsisdn and getLine1Number to READ_PHONE_NUMBERS" into rvc-dev 2020-03-18 18:04:18 +00:00
Kweku Adams
215ed2781f Merge "Unrestrict updated buggy apps." into rvc-dev am: 87962f9d0a 
Change-Id: Ie539d7a6ce70a6e8eee5161008bdc5512a2668b2
 2020-03-18 18:02:49 +00:00
Kweku Adams
87962f9d0a Merge "Unrestrict updated buggy apps." into rvc-dev 2020-03-18 18:01:04 +00:00
TreeHugger Robot
c54c343795 Merge "Tuner API: set default values of FilterConfig" into rvc-dev am: 48c1ef6e77 
Change-Id: I85609bd438d7338e85a0414dae0c60f023d16cef
 2020-03-18 17:56:40 +00:00
TreeHugger Robot
da515c5241 Merge "Tuner API: set default values of FrontendSettings" into rvc-dev am: 9a6e5241eb 
Change-Id: I9aea738d615ca7ea9ff896a63f89da2376aefcd1
 2020-03-18 17:56:22 +00:00
Christine Tsai
a0328d42ea Merge "(Part 2.2) Use new socket schema in ValueMetricProducer_test" into rvc-dev am: 300ee6ea68 
Change-Id: I0999d29a3e6ce47405fe6c2cc52d07e0f6c9e191
 2020-03-18 17:56:08 +00:00
TreeHugger Robot
eb32a6e7fd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65964e053e -s ours am: c5cd021665 -s ours 
am skip reason: subject contains skip directive

Change-Id: I01d5fedc67b22cdf3538ec6521ef14891e31299d
 2020-03-18 17:55:46 +00:00
Yu-Han Yang
644308c8bc Merge "Update inter-signal bias (framework)" into rvc-dev am: f7fcee236e 
Change-Id: I61f19ed0b8a7b33959e617ed42a88cc3cebacd8d
 2020-03-18 17:55:31 +00:00
TreeHugger Robot
48c1ef6e77 Merge "Tuner API: set default values of FilterConfig" into rvc-dev 2020-03-18 17:51:18 +00:00