Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,200 Commits 3 Branches 0 Tags
203b2dcecdcbc3dec103f4ac45642cecf20308d4
Commit Graph

485200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Artur Satayev
203b2dcecd [automerger skipped] Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev am: a56084eaa5 -s ours am: f1907483cf -s ours 
am skip reason: Change-Id If9dcac94eb077c6265c5acf5b3ce6d262db64f90 with SHA-1 7e7fdde3a5 is in history

Change-Id: I2b9386ee94e3deccff1dedc855ffaa1d7cf18581
 2020-04-01 13:36:20 +00:00
TreeHugger Robot
bddd290a0b Merge "Do not use BIND_RESTRICT_ASSOCIATIONS when binding TextClassifierService" into rvc-dev am: 47300548b7 am: 157ea3c271 
Change-Id: If30ac606658d62d1102c7f98acc425168d78ea7f
 2020-04-01 13:36:02 +00:00
Artur Satayev
88b16c54d1 [automerger skipped] Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev am: a56084eaa5 am: 160f416c2b -s ours 
am skip reason: Change-Id If9dcac94eb077c6265c5acf5b3ce6d262db64f90 with SHA-1 0a97d5eaf2 is in history

Change-Id: I579c6609ff9034c6ed32bdde0b865189279c6461
 2020-04-01 13:29:19 +00:00
TreeHugger Robot
8e1310f9c4 Merge "Do not use BIND_RESTRICT_ASSOCIATIONS when binding TextClassifierService" into rvc-dev am: 47300548b7 am: 8defa97359 
Change-Id: I54c20099ba2034ac31a5ef54e1d45e53c60f984d
 2020-04-01 13:29:04 +00:00
Artur Satayev
160f416c2b Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev am: a56084eaa5 
Change-Id: I5f3868cb72a45ee1583d75b5be2de0d3a29ee242
 2020-04-01 13:15:26 +00:00
Artur Satayev
f1907483cf [automerger skipped] Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev am: a56084eaa5 -s ours 
am skip reason: Change-Id If9dcac94eb077c6265c5acf5b3ce6d262db64f90 with SHA-1 0a97d5eaf2 is in history

Change-Id: I07c3c9433f8f76c13b724d35bde6a82c108740cb
 2020-04-01 13:15:11 +00:00
TreeHugger Robot
157ea3c271 Merge "Do not use BIND_RESTRICT_ASSOCIATIONS when binding TextClassifierService" into rvc-dev am: 47300548b7 
Change-Id: I9957dd667d899d342d4466c9ccf706a12d74aa72
 2020-04-01 13:14:26 +00:00
TreeHugger Robot
8defa97359 Merge "Do not use BIND_RESTRICT_ASSOCIATIONS when binding TextClassifierService" into rvc-dev am: 47300548b7 
Change-Id: I8ded8d99d766f7d888fa30ebf5a5e1ece93f6162
 2020-04-01 13:14:14 +00:00
Artur Satayev
a56084eaa5 Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev 2020-04-01 13:07:41 +00:00
TreeHugger Robot
47300548b7 Merge "Do not use BIND_RESTRICT_ASSOCIATIONS when binding TextClassifierService" into rvc-dev 2020-04-01 12:59:09 +00:00
Anton Hansson
3c30bb4bf5 Merge "Don't link wifi utils against android_system_stubs" into rvc-dev am: d972846baa am: 9738f7580a 
Change-Id: Id1dffcb2235d0f217d18e66054c3d8d761ee2ea1
 2020-04-01 11:59:38 +00:00
Anton Hansson
8fe40e148d Merge "Don't link wifi utils against android_system_stubs" into rvc-dev am: d972846baa am: c5c3734017 
Change-Id: Id4258aa76ee4ff28d2fe3b71f0361a2de0b86819
 2020-04-01 11:59:19 +00:00
Anton Hansson
9738f7580a Merge "Don't link wifi utils against android_system_stubs" into rvc-dev am: d972846baa 
Change-Id: Iefdea46d4b429928294d50df6a2269877f29d41a
 2020-04-01 11:45:53 +00:00
Anton Hansson
c5c3734017 Merge "Don't link wifi utils against android_system_stubs" into rvc-dev am: d972846baa 
Change-Id: Iaabffd9966a394b6cf8a2bef06b38253ab80f191
 2020-04-01 11:45:35 +00:00
Anton Hansson
bb9f9a0afe Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e049 am: f85800f31f 
Change-Id: Iee0f0bdb2693f90c50731e7c34c464dfc01a74ae
 2020-04-01 11:30:15 +00:00
Anton Hansson
e838fbbe57 Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e049 am: f1e82fe6fc 
Change-Id: I09a911e31be85f8ab40b8c611fffe93349a39a1b
 2020-04-01 11:29:35 +00:00
Anton Hansson
d972846baa Merge "Don't link wifi utils against android_system_stubs" into rvc-dev 2020-04-01 11:29:12 +00:00
Anton Hansson
f85800f31f Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e049 
Change-Id: I26ba05d8a00484a4e76623331588e26b8f19f6b1
 2020-04-01 11:20:09 +00:00
Anton Hansson
f1e82fe6fc Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e049 
Change-Id: Ib58f29ee7e1fa575cf2c48d3a0c2522aa466b4bd
 2020-04-01 11:20:04 +00:00
Anton Hansson
c333c8e049 Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev 2020-04-01 11:03:07 +00:00
Galia Peycheva
11b0d3f308 Merge changes Id6161f92,Ie0d8849a into rvc-dev am: 5a0549cd42 am: 25a7e5b09f 
Change-Id: I9b9e0af0794ca4350a18f01312f06cf480e6324b
 2020-04-01 10:44:44 +00:00
Galia Peycheva
4756b376d7 Merge changes Id6161f92,Ie0d8849a into rvc-dev am: 5a0549cd42 am: 2531e5c1ed 
Change-Id: I6f5ab9ca617ecf168004ceefc8fbadc808318810
 2020-04-01 10:44:26 +00:00
Galia Peycheva
25a7e5b09f Merge changes Id6161f92,Ie0d8849a into rvc-dev am: 5a0549cd42 
Change-Id: I50b85f02973ab97e661e533b65753c0a4bfaf379
 2020-04-01 10:32:18 +00:00
Galia Peycheva
2531e5c1ed Merge changes Id6161f92,Ie0d8849a into rvc-dev am: 5a0549cd42 
Change-Id: Ib367db22500a39c46cfd3bd9876d63f8c7273070
 2020-04-01 10:32:03 +00:00
Galia Peycheva
5a0549cd42 Merge changes Id6161f92,Ie0d8849a into rvc-dev 
* changes:
  Introduce security checks to startDreamActivity
  Add verification for setting ACTIVITY_TYPE_DREAM
 2020-04-01 10:18:19 +00:00
Chiachang Wang
23eab8868c [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: eea2946e80 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 59ed66a8a5 is in history

Change-Id: I8ab7bf30792b69ec23cf28a17771ffe243abd162
 2020-04-01 09:24:08 +00:00
Chiachang Wang
9cffd9536e [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: 49a4f38a28 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 59ed66a8a5 is in history

Change-Id: I0b4d8e47e8900c0aaf9cee4e95956401e3087b30
 2020-04-01 09:23:54 +00:00
Chiachang Wang
eea2946e80 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours 
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 59ed66a8a5 is in history

Change-Id: I728c5080b92ffa7c8c2524f2430252af1faee963
 2020-04-01 09:11:18 +00:00
Chiachang Wang
49a4f38a28 Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 
Change-Id: Iea5f995291bdbe3081c8f7ded5bf4f3f50e6c7d1
 2020-04-01 09:11:13 +00:00
Chiachang Wang
d7df0c13d9 Merge "Update constructor of NetworkMonitor" into rvc-dev 2020-04-01 08:59:12 +00:00
Aaron Huang
fa36f9797f [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e99aa91e87 am: b71c5cc720 -s ours am: 71f4940130 -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 14caf974db is in history

Change-Id: Ieb1eb1874b6160999da847557dac5e8d4a184e3f
 2020-04-01 06:02:52 +00:00
Chalard Jean
dff8394efe [automerger skipped] Update NetworkAgentConfig API for council comments am: d670534507 am: d7b73dcc8f -s ours am: 76da8a6362 -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 1d2d35d049 is in history

Change-Id: I3c2a67c8c613fb6a7bc37d004b6c4a3f44cd761c
 2020-04-01 06:02:51 +00:00
Chalard Jean
6aa7886192 [automerger skipped] Update the NetworkAgent API for council comments am: d2b02d4c1c am: 84d8e8009c -s ours am: 24d20c6413 -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 f1dec6101b is in history

Change-Id: I1c5f6c675417272217a4c15bdae2c8f9f5c35d5a
 2020-04-01 06:02:48 +00:00
Aaron Huang
71f4940130 [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: e99aa91e87 am: b71c5cc720 -s ours 
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 14caf974db is in history

Change-Id: Ic318324c0424d0ad106b0c92c1cb55ba616c6b2b
 2020-04-01 05:58:30 +00:00
Chalard Jean
76da8a6362 [automerger skipped] Update NetworkAgentConfig API for council comments am: d670534507 am: d7b73dcc8f -s ours 
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 1d2d35d049 is in history

Change-Id: Icf2ec01fe46cf905b2636d064fd68e2ff9e546e7
 2020-04-01 05:58:23 +00:00
Winson Chiu
ff408c671e Merge changes Id7d1ff26,Id53a2e65 into rvc-dev am: bde104f8be am: 7ed7e77f9b 
Change-Id: Ibb160bd3e2b25d6b494b5862aa09c4cd52cb88a9
 2020-04-01 05:58:21 +00:00
Chalard Jean
24d20c6413 [automerger skipped] Update the NetworkAgent API for council comments am: d2b02d4c1c am: 84d8e8009c -s ours 
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 f1dec6101b is in history

Change-Id: Iac85b28ac13c794999110e7cd54f1816dd298967
 2020-04-01 05:58:14 +00:00
Winson Chiu
0f31ef312c Merge changes Id7d1ff26,Id53a2e65 into rvc-dev am: bde104f8be am: 1eeef296d2 
Change-Id: Iff9da94f7283eea1a725b58cbe283b4b8a785b67
 2020-04-01 05:58:06 +00:00
TreeHugger Robot
6eb64a5c31 Merge "Simplify WindowState#reportResized" into rvc-dev am: 456365644b am: 30f394871c 
Change-Id: I43b100a65eb5933083983063bb0d3a8bb642eadc
 2020-04-01 05:57:53 +00:00
TreeHugger Robot
58eab9c376 Merge "Simplify WindowState#reportResized" into rvc-dev am: 456365644b am: 95cf4eb131 
Change-Id: Icaf486e61e8027492ce808ba667a7555e2ee5309
 2020-04-01 05:57:38 +00:00
TreeHugger Robot
07230e8cd8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9c637474fb -s ours am: d43de39db5 -s ours 
am skip reason: subject contains skip directive

Change-Id: I21ebabfca865014b9236e6eade749f72f01f1777
 2020-04-01 05:57:30 +00:00
TreeHugger Robot
203b4f9330 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9c637474fb -s ours am: 54097405b5 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4e49fa3cbfd889ff300f64145b0939596be30bdb
 2020-04-01 05:57:17 +00:00
Aaron Huang
b71c5cc720 Merge changes from topics "networkagent_api", "networkprovider_api" am: e99aa91e87 
Change-Id: I553a53bc4612fc367591738d9669e354730fdacc
 2020-04-01 05:47:04 +00:00
Chalard Jean
d7b73dcc8f Update NetworkAgentConfig API for council comments am: d670534507 
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
 2020-04-01 05:46:58 +00:00
Chalard Jean
84d8e8009c Update the NetworkAgent API for council comments am: d2b02d4c1c 
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
 2020-04-01 05:46:50 +00:00
Winson Chiu
1eeef296d2 Merge changes Id7d1ff26,Id53a2e65 into rvc-dev am: bde104f8be 
Change-Id: Ib687652d8b04f7b6241351c078f583baafd1f73e
 2020-04-01 05:45:41 +00:00
Winson Chiu
7ed7e77f9b Merge changes Id7d1ff26,Id53a2e65 into rvc-dev am: bde104f8be 
Change-Id: Id7585d461aba77b63d7805e01ef8c305d35eed63
 2020-04-01 05:45:33 +00:00
TreeHugger Robot
30f394871c Merge "Simplify WindowState#reportResized" into rvc-dev am: 456365644b 
Change-Id: Ia1305b0509dfa1e004991c80981912f4844cf5ed
 2020-04-01 05:45:15 +00:00
TreeHugger Robot
95cf4eb131 Merge "Simplify WindowState#reportResized" into rvc-dev am: 456365644b 
Change-Id: Ib1f8b8a43194ce9b2bd00a8f4ddd1bcb461f6cc8
 2020-04-01 05:45:01 +00:00
TreeHugger Robot
d43de39db5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 9c637474fb -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib804a5bcc973d4217ccc18fd3eb0c94cd3640f69
 2020-04-01 05:44:38 +00:00