Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
451,268 Commits 3 Branches 0 Tags
65933613cc61408400a102a48411967ba483422f
Commit Graph

451268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taesu Lee
65933613cc Merge "Remove unnecessary calling getApplicationContex()" am: 2cc5a85213 am: abfa4692f3 
am: 592274ed2b

Change-Id: I060bddc927fca4c7e7b2e8c590f6c51bc3cf4a1f
 2019-11-18 01:20:00 -08:00
Taesu Lee
592274ed2b Merge "Remove unnecessary calling getApplicationContex()" am: 2cc5a85213 
am: abfa4692f3

Change-Id: I20978815f3c9aa4dfb79cf3ec320f389209cdc3d
 2019-11-18 01:15:58 -08:00
Robert Horvath
070374046c Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f am: 16a5ce0026 
am: 85e44e1976

Change-Id: I9de7cf1830720ce025e0e4aa73b2fa00f1fceffa
 2019-11-18 01:14:27 -08:00
Robert Horvath
8a3553fc22 [automerger skipped] Merge "Add OWNERS for media TV" am: 4776c31c22 am: e207293928 
am: 7fba59ebcb -s ours
am skip reason: change_id I2c99a7a1ab78c634fc94dfe96b6617b0bde4efdf with SHA1 fb5cb3c815 is in history

Change-Id: I88cb7a129d60db16242571359b6c5654b9db9e7a
 2019-11-18 01:12:59 -08:00
Taesu Lee
abfa4692f3 Merge "Remove unnecessary calling getApplicationContex()" 
am: 2cc5a85213

Change-Id: I7239300215f22d9cdd100ba66c7ad9f48f84ecee
 2019-11-18 01:12:29 -08:00
Jayachandran Chinnakkannu
3455ba1da6 Merge "Remove usage of Telephonymanager getDefault() hidden API" am: 29146f991b am: 400c51fa68 
am: 8b8cb98096

Change-Id: I6d90bb47900be91001e0bcf909ec63e35e9b9b94
 2019-11-18 01:11:05 -08:00
Robert Horvath
85e44e1976 Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f 
am: 16a5ce0026

Change-Id: I1b3eb99edaef15e43f2c10e4bbc67665455d74f4
 2019-11-18 01:10:38 -08:00
Jayachandran Chinnakkannu
a46de19da4 Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d am: 306f8cecf8 
am: 6d2b8e0d6a

Change-Id: Ief1f090f3664d583565f291c89357bfbac58fe17
 2019-11-18 01:09:40 -08:00
Robert Horvath
7fba59ebcb Merge "Add OWNERS for media TV" am: 4776c31c22 
am: e207293928

Change-Id: I786b4bd5bd8463d1217c9ca1f9e91d673498c4bc
 2019-11-18 01:09:21 -08:00
Robert Horvath
16a5ce0026 Merge "Rename OWNER to OWNERS for media/tv" 
am: a4ff2b159f

Change-Id: I6fb78bc065217e79f3425d999ee75e37fe2edc4c
 2019-11-18 01:07:48 -08:00
Jayachandran Chinnakkannu
8b8cb98096 Merge "Remove usage of Telephonymanager getDefault() hidden API" am: 29146f991b 
am: 400c51fa68

Change-Id: I7bf39235ed2a8b947479c791e04365254ad58b8d
 2019-11-18 01:05:59 -08:00
Robert Horvath
e207293928 Merge "Add OWNERS for media TV" 
am: 4776c31c22

Change-Id: I218c902b159ed68aa083130287d41fc7806bae5d
 2019-11-18 01:05:37 -08:00
Jayachandran Chinnakkannu
6d2b8e0d6a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 73e22ad21d 
am: 306f8cecf8

Change-Id: I7613a654dd726bcf5428a5a07ad4369f616bbcfa
 2019-11-18 01:05:02 -08:00
Treehugger Robot
2cc5a85213 Merge "Remove unnecessary calling getApplicationContex()" 2019-11-18 08:59:31 +00:00
Robert Horvath
a4ff2b159f Merge "Rename OWNER to OWNERS for media/tv" 2019-11-18 08:13:40 +00:00
Robert Horvath
4776c31c22 Merge "Add OWNERS for media TV" 2019-11-18 08:10:47 +00:00
Jayachandran Chinnakkannu
400c51fa68 Merge "Remove usage of Telephonymanager getDefault() hidden API" 
am: 29146f991b

Change-Id: I3b389f3d8f4cae83fa7cf462eb222cdf8995b483
 2019-11-17 22:30:59 -08:00
Jayachandran Chinnakkannu
306f8cecf8 Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" 
am: 73e22ad21d

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
 2019-11-17 22:30:01 -08:00
Jayachandran Chinnakkannu
29146f991b Merge "Remove usage of Telephonymanager getDefault() hidden API" 2019-11-18 06:19:58 +00:00
Jayachandran Chinnakkannu
b61af00a0e Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" 2019-11-18 06:16:42 +00:00
Jayachandran Chinnakkannu
73e22ad21d Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" 2019-11-18 06:16:09 +00:00
TreeHugger Robot
4ac646cd1a Merge "Add new string for new Bluetooth developer option" 2019-11-18 05:43:04 +00:00
Rahul Sabnis
ce1c461f6c Merge "Re-add getAliasName to fix build breakage" am: e905264d3c am: f6231d08d1 
am: d01af7b1b2

Change-Id: Ie577452177e364cde4e894f492b439988a6d214a
 2019-11-17 20:46:11 -08:00
TreeHugger Robot
799baadbaf Merge "Import translations. DO NOT MERGE" 2019-11-18 04:45:37 +00:00
Rahul Sabnis
d01af7b1b2 Merge "Re-add getAliasName to fix build breakage" am: e905264d3c 
am: f6231d08d1

Change-Id: I4f965e8712f7c039c54162584f48f3a103420601
 2019-11-17 20:42:33 -08:00
Rahul Sabnis
f6231d08d1 Merge "Re-add getAliasName to fix build breakage" 
am: e905264d3c

Change-Id: Icda73f1ab221523248249f88fb9f0f4dd5da3a19
 2019-11-17 20:39:01 -08:00
Goven Liu
b75323eb34 Merge "[Wi-Fi] Add intent action ＆ extra keys & result codes for add networks." 2019-11-18 04:33:17 +00:00
Treehugger Robot
e905264d3c Merge "Re-add getAliasName to fix build breakage" 2019-11-18 04:24:51 +00:00
TreeHugger Robot
aa177e1841 Merge "DeviceIdleControl: spy handle message for idle factortest case" 2019-11-18 03:37:42 +00:00
Bill Yi
ca380ece88 Import translations. DO NOT MERGE 
Change-Id: I425e6bd27bc0cb8e8ad85e795ca743b93bf7d07f
Auto-generated-cl: translation import
 2019-11-17 11:30:23 -08:00
Bill Yi
933d3e1c60 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 64f417f0ae -s ours 
am: 7cc4ae5afc -s ours
am skip reason: subject contains skip directive

Change-Id: I813cdbe3ac946133b36962e75b473f71115ee524
 2019-11-17 08:14:49 -08:00
Bill Yi
7cc4ae5afc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 64f417f0ae -s ours
am skip reason: subject contains skip directive

Change-Id: I5449b787f5bd1468b7ec423407a4c34338949bc1
 2019-11-17 08:11:19 -08:00
TreeHugger Robot
64f417f0ae Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-11-17 16:00:24 +00:00
Bill Yi
d56745b074 Import translations. DO NOT MERGE 
Change-Id: I968dea21531f5be59f2b413af19165e0cae6a209
Auto-generated-cl: translation import
 2019-11-16 20:14:49 -08:00
Rahul Sabnis
d14320d21c Re-add getAliasName to fix build breakage 
Bug: 144619887
Test: Manual
Change-Id: Ib4f3582a1c9cb8cbcb14fece6a3ab463b3400cea
 2019-11-16 11:52:13 -08:00
Jiyong Park
54f726ccaa [automerger skipped] Merge "remove framework_base_subdirs" am: 46397049fe am: 7cd8f399f7 
am: de26442649 -s ours
am skip reason: change_id Idfa2aa392ae1da9582e7691a8c06c986baad5088 with SHA1 e53786e864 is in history

Change-Id: Ida2dbab0975cd9af137b4472e03a7287e0fdcff5
 2019-11-16 07:38:20 -08:00
Jiyong Park
de26442649 Merge "remove framework_base_subdirs" am: 46397049fe 
am: 7cd8f399f7

Change-Id: I1dc1009490d3e1d26257b7490f1a44bd91b91085
 2019-11-16 07:35:07 -08:00
Jiyong Park
7cd8f399f7 Merge "remove framework_base_subdirs" 
am: 46397049fe

Change-Id: I910bc8f5f7266e70fe3d8549aab51c2e504298a0
 2019-11-16 07:31:54 -08:00
Jiyong Park
46397049fe Merge "remove framework_base_subdirs" 2019-11-16 15:21:03 +00:00
Bill Yi
ae4625a9d1 [automerger skipped] Import translations. DO NOT MERGE am: 08e60f1702 -s ours 
am: 41b242c333 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic2f134238e098c6b337bbb2707b9abafbe39e397
 2019-11-16 06:33:21 -08:00
Bill Yi
41b242c333 [automerger skipped] Import translations. DO NOT MERGE 
am: 08e60f1702 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6f0e608317cacbf0a95e15909f89f0ec9314468
 2019-11-16 06:29:49 -08:00
Jiyong Park
ced28d531d remove framework_base_subdirs 
Metalava no longer requires it at least for droidstubs in this
directory. Even when local_sourcepath is not set, the -sourcepath option
is set to the module directory (frameworks/base in this case), and
metalava tries to find package.html files under the directory to know if
a package is hidden or not.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 144264106
Test: m

Merged-In: Idfa2aa392ae1da9582e7691a8c06c986baad5088
(cherry picked from commit e53786e864)
Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
 2019-11-16 20:48:06 +09:00
Bill Yi
08e60f1702 Import translations. DO NOT MERGE 
Change-Id: I3cd04293441364321633db92ef92748d5e0fd42a
Auto-generated-cl: translation import
 2019-11-16 03:00:01 -08:00
TreeHugger Robot
19e6a8c5c1 Merge "remove framework_base_subdirs" 2019-11-16 08:08:52 +00:00
Jayachandran C
82e53b725a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 am: 0a86ee3b3e 
am: 78f84d5abe

Change-Id: I24e2c0c353f9e74a65c2e3d24a43338022b3efc4
 2019-11-15 22:25:23 -08:00
Jack Yu
4de8ade6ff [automerger skipped] Merge "Migrated message duplicate detection to cell broadcast service" am: c774ff0743 am: 134df4649a 
am: 9dfeec91dc -s ours
am skip reason: change_id I6bbe8e938846d07b1260eb83e532b7f46aeabeaf with SHA1 ffc2c11604 is in history

Change-Id: I5192d0865340c3a451a920c3e58e2fa1d931b70c
 2019-11-15 22:20:39 -08:00
Jayachandran C
78f84d5abe Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 
am: 0a86ee3b3e

Change-Id: I2b1be68cd2eea8a4795a882933ed91dbf6ed83ee
 2019-11-15 22:11:01 -08:00
Jack Yu
9dfeec91dc Merge "Migrated message duplicate detection to cell broadcast service" am: c774ff0743 
am: 134df4649a

Change-Id: Ib0480294f83a426e980d1b2ae110bae0cce5b4df
 2019-11-15 22:08:05 -08:00
TreeHugger Robot
c2bbc9ae44 Merge "Fix javadoc link in SubscriptionManager" 2019-11-16 04:56:53 +00:00
Jeff Sharkey
eca95ef9e8 Merge changes from topic "nov15" 
* changes:
  Expand ContentProviderOperation support of extras.
  Extend insert/update/delete to provide extras.
  Query arguments for grouping, other SQL clauses.
 2019-11-16 04:20:10 +00:00