Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
326,561 Commits 3 Branches 0 Tags
137d09aa074df979110db4d700ade5a68559d27a
Commit Graph

326561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
9b7be0c3f5 Merge "resolve merge conflicts of 8f1d13300f to oc-dr1-dev" into oc-dr1-dev 
am: c14f46b135

Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93
 2017-06-13 00:29:15 +00:00
Bill Yi
3624e527be Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours 
am: e887d21330  -s ours

Change-Id: Ie236dae37b227cf65c837e0efea1ea1f9e9aa9b3
 2017-06-13 00:29:07 +00:00
Pankaj Kanwar
ef6b81e5b2 Merge "Address IMSI privacy issues." 2017-06-13 00:28:44 +00:00
Bill Yi
5a3998fe38 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 7c2a12b658  -s ours

Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d
 2017-06-13 00:27:05 +00:00
Will Brazil
308a19531e Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 
am: 5884f6ce0d

Change-Id: I725739aed3207992022aa500bb99072410a9a305
 2017-06-13 00:26:49 +00:00
Will Brazil
938fe5c968 Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev 
am: 71029bf631

Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
 2017-06-13 00:24:40 +00:00
Jorim Jaggi
c14f46b135 Merge "resolve merge conflicts of 8f1d13300f to oc-dr1-dev" into oc-dr1-dev 2017-06-13 00:21:31 +00:00
Jorim Jaggi
827dfe078f Merge "resolve merge conflicts of 963fed0345 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp 2017-06-13 00:20:42 +00:00
Jeff Sharkey
de624f3fbb Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev 
am: f7dc56ecc9

Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
 2017-06-13 00:14:55 +00:00
pkanwar
ce7e7c71c9 Address IMSI privacy issues. 
Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

CP from Master

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d
 2017-06-13 00:14:36 +00:00
Bill Yi
1b1277dab2 Import translations. DO NOT MERGE 
Change-Id: Ia5c4fec39dd96d826c34c06ea398e05fb53e3328
Auto-generated-cl: translation import
 2017-06-12 17:10:34 -07:00
Jeff Sharkey
f7dc56ecc9 Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev 2017-06-13 00:09:50 +00:00
Bill Yi
996a9b4a4b Import translations. DO NOT MERGE 
Change-Id: If1852e89c1a3732b3f85c47bfa108ee3f4d5fac7
Auto-generated-cl: translation import
 2017-06-12 17:05:16 -07:00
Wale Ogunwale
90159a2492 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev 
am: e1e0db8ca9

Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114
 2017-06-13 00:02:11 +00:00
Tianjie Xu
d04d501ce7 Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev 
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
 2017-06-12 23:55:23 +00:00
Narayan Kamath
cfd0f9beee Binder: Log details of pending exception. 
This was accidentally removed by change d64abfcf93.

Test: manual; verify exception trace is printed in logs.
Bug: 36813403
Bug: 37435516
Change-Id: I73ae8de167c457d56fddb85943a8f08f8913f0f7
(cherry picked from commit ccc9fad9e6)
 2017-06-12 16:54:40 -07:00
Narayan Kamath
83a24af545 Binder: Be forceful about a forceful exit. 
We were previously using exit(1) when code servicing an IPC threw
any subclass of Error. That made it much harder to diagnose cases
where that happened because :

- exit runs global destructors, which might prove problematic (see
  linked bug).
- such exits are often due to bugs in application code (things like
  AssertionErrors being thrown) but aren't flagged as such by our
  infrastructure, or by humans for that matter.

To address both issues, use FatalError() so that the runtime can dump
more useful information to the logs before it aborts.

Test: manual
Bug: 36813403
Change-Id: I5826090229109dc7cb19f0c3571c609f990cd36a
(cherry picked from commit d64abfcf93)
 2017-06-12 16:54:40 -07:00
Wale Ogunwale
e1e0db8ca9 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev 2017-06-12 23:51:19 +00:00
Robert Carr
2fa5800da9 Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev 
am: 42b3610adc

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba
 2017-06-12 23:45:37 +00:00
TreeHugger Robot
f40f297546 Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev 2017-06-12 23:42:02 +00:00
TreeHugger Robot
42b3610adc Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev 2017-06-12 23:38:19 +00:00
Winson Chung
60fa647427 Minimal change to ensure events are propagated to the right DividerView. 
- The RecentsDrawnEvent sent when Recents is first drawn can be racey, if
  it is sent before the configuration change in Divider is dispatched, then
  it will be posted for the old DividerView, which prior to ag/2363241 was
  still sending the correct resize calls (the animation is independent of
  the view).  For now, we register the event handler in Divider, and
  instead proxy it to the current view when it is posted.

Bug: 62528361
Test: go/wm-smoke
Test: Play a movie in Play Movies, ensure the activity is resized

Change-Id: I665b0c6af55dea0db1916f5b041589bf72da3baf
 2017-06-12 16:10:52 -07:00
Jorim Jaggi
78c9744f41 Merge "Attempted fix for navigation bar flicker" into oc-dev 
am: bbd7dfc0a4

Change-Id: I66814b15777b180596fd91ac8906f9df698a2d19
 2017-06-12 23:07:19 +00:00
TreeHugger Robot
bbd7dfc0a4 Merge "Attempted fix for navigation bar flicker" into oc-dev 2017-06-12 23:01:19 +00:00
Marie Janssen
297dbb86fe Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 
am: 00bce50dc3

Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a
 2017-06-12 22:57:58 +00:00
Marie Janssen
77ded58c5f Protect broadcast used in settings for bond cancel 
Test: cancel pairing from notification tray
Bug: 62094630
Change-Id: Ia83a874c1ea9a1d9d5502609f81e94052bb5759c
(cherry picked from commit 977992f3fc)
 2017-06-12 22:51:17 +00:00
Marie Janssen
00bce50dc3 Merge "Protect broadcast used in settings for bond cancel" 
am: 5cfbbce162

Change-Id: Ieb433bca4189ba3d309b417ed6822e836c9468ed
 2017-06-12 22:47:00 +00:00
Tyler Gunn
0d14298f80 Merge changes from topic 'ims-handover-api' into oc-dr1-dev 
am: e15da2649b

Change-Id: I98a44fe768bdffaaaca742b1c9e8e10f42c73a90
 2017-06-12 22:46:58 +00:00
Jeff Sharkey
f96c9a0fa2 Merge "Improve developer docs for storage APIs." into oc-dev 
am: 05b52d8ba5

Change-Id: I36dbac981e7a11819bd120c604f491eca11018a4
 2017-06-12 22:45:22 +00:00
Jeff Sharkey
05b52d8ba5 Merge "Improve developer docs for storage APIs." into oc-dev 2017-06-12 22:39:26 +00:00
Marie Janssen
5cfbbce162 Merge "Protect broadcast used in settings for bond cancel" 2017-06-12 22:36:08 +00:00
Tyler Gunn
e15da2649b Merge changes from topic 'ims-handover-api' into oc-dr1-dev 
* changes:
  Add callSessionMayHandover API to ImsCallSession.
  IMS: Support for Possible Call Session Handover
 2017-06-12 22:35:45 +00:00
Jeff Sharkey
dd96cfc4ef Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev 
am: 3d4c62de10

Change-Id: Iea3267aeea3c9633876cc055e45d095e0c5f1306
 2017-06-12 22:00:09 +00:00
Mady Mellor
7fc5ab55bc Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev 
am: f3f6ddf7cb

Change-Id: I0147acff32fb79096617dff8080fab677d6c805e
 2017-06-12 21:57:17 +00:00
Todd Kennedy
5ca9d413f8 Merge "Don't log all instant app resolutions" into oc-dev 
am: 3ef0b8260f

Change-Id: Ibcc839c12fd0c23da254992a7147abb1e08d17cc
 2017-06-12 21:57:15 +00:00
TreeHugger Robot
3ef0b8260f Merge "Don't log all instant app resolutions" into oc-dev 2017-06-12 21:51:34 +00:00
Vladislav Kaznacheev
7e21054200 Merge changes from topic 'sysui-tooltip' into oc-dev 
am: 3fbcec5b86

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c
 2017-06-12 21:51:10 +00:00
Jeff Sharkey
3d4c62de10 Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev 2017-06-12 21:50:39 +00:00
Mady Mellor
f3f6ddf7cb Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev 2017-06-12 21:48:45 +00:00
TreeHugger Robot
3fbcec5b86 Merge changes from topic 'sysui-tooltip' into oc-dev 
* changes:
  Pass window token when creating a tooltip popup
  Revert "Use a PopupWindow to show tooltips"
 2017-06-12 21:42:57 +00:00
Bill Yi
3e735ea914 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: 66c8f60eb7  -s ours

Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e
 2017-06-12 21:32:23 +00:00
Bill Yi
6e96950a37 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: fe84caad61  -s ours

Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b
 2017-06-12 21:30:08 +00:00
TreeHugger Robot
66c8f60eb7 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-12 21:24:50 +00:00
TreeHugger Robot
fe84caad61 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-12 21:24:16 +00:00
Bill Yi
e887d21330 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 7c2a12b658  -s ours

Change-Id: I4170e095966f1d8752e2b020777b5719a779b376
 2017-06-12 21:21:12 +00:00
TreeHugger Robot
7c2a12b658 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-12 21:15:34 +00:00
Jorim Jaggi
624d81dbec resolve merge conflicts of 963fed0345 to oc-dr1-dev-plus-aosp 
Change-Id: Ife92b10f60b68cb5cfc970a52a248692c6342e17
 2017-06-12 13:52:31 -07:00
Will Brazil
5884f6ce0d Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev 
am: 71029bf631

Change-Id: I24120e653feef23b155111cbc69f6b3033b2427c
 2017-06-12 20:49:49 +00:00
Jorim Jaggi
ee18e78d81 resolve merge conflicts of 8f1d13300f to oc-dr1-dev 
Change-Id: I1a30ba6663041e1ce0a2d347671deb83b1d9d7ff
 2017-06-12 13:45:50 -07:00
TreeHugger Robot
71029bf631 Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev 2017-06-12 20:45:42 +00:00