Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Kulian
d992a917aa DO NOT MERGE -- Adjust focus when moving task back am: d4b98705b5 
am: 75cd6ef5dc

Change-Id: I07746c065e749549c7a30820f10f24945b30c760
 2016-10-13 05:07:15 +00:00
Andrii Kulian
c4ceb50303 Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev 
am: 1fefc8b9fa

Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed
 2016-10-13 05:01:15 +00:00
Andrii Kulian
75cd6ef5dc DO NOT MERGE -- Adjust focus when moving task back 
am: d4b98705b5

Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81
 2016-10-13 05:01:11 +00:00
TreeHugger Robot
1fefc8b9fa Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev 2016-10-13 04:47:46 +00:00
Sungsoo
2dbe166801 ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
 2016-10-13 13:06:24 +09:00
Sungsoo
7ce9243087 DO NOT MERGE) ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
 2016-10-13 03:29:14 +00:00
Sungsoo
87a9ac70c3 DO NOT MERGE) ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
 2016-10-13 03:28:40 +00:00
Sungsoo
22bd36448e DO NOT MERGE) ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
 2016-10-13 03:28:16 +00:00
Sungsoo
c11f599a2f DO NOT MERGE) ExifInterface: Provide backward compatibility 
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
 2016-10-13 12:25:03 +09:00
Andrii Kulian
d4b98705b5 DO NOT MERGE -- Adjust focus when moving task back 
Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.

Bug: 31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361
 2016-10-13 03:14:07 +00:00
Robert Carr
4c1d0797bc Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev am: 1553d5411c 
am: 708d218468

Change-Id: Ic93d5ea5c3fda6cde0368c399c8919819f4114ce
 2016-10-13 02:23:02 +00:00
Robert Carr
486238f787 Correct recently introduced logic error in seamless rotation detection. am: e441e7f15f 
am: bcbf6707b0

Change-Id: I856eec21e2d7687683a0bcde683ea6b7a05dd20a
 2016-10-13 02:22:06 +00:00
Robert Carr
708d218468 Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev 
am: 1553d5411c

Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f
 2016-10-13 02:15:33 +00:00
Robert Carr
bcbf6707b0 Correct recently introduced logic error in seamless rotation detection. 
am: e441e7f15f

Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a
 2016-10-13 02:15:31 +00:00
TreeHugger Robot
1553d5411c Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev 2016-10-13 02:05:33 +00:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle 
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
 2016-10-12 18:17:58 -07:00
Selim Cinek
20307881d7 Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" 
am: 6f3a05ae77  -s ours

Change-Id: I6c171749daead32d9a5e88aefa0a2a50cd767253
 2016-10-13 01:01:10 +00:00
Selim Cinek
cb654a5fbd Merge "DO NOT MERGE - Added translations for emergency action string" 
am: d33e79c328  -s ours

Change-Id: I3fe6f222f2c70a0b50147f5439c54d8553dda092
 2016-10-13 01:00:24 +00:00
Selim Cinek
56be18379f Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev am: 0bdfc7be66 
am: 77988e4aec

Change-Id: I02d6144c1b0ed72e178cd4e3899670b7d4c3d5a9
 2016-10-13 00:58:30 +00:00
Selim Cinek
5a0845841d Fixed a bug where the system could crash when expanding am: 3e77984434 
am: c19b510454

Change-Id: I9a08497e8c49fe916f42cac3a1d56ea5ec4fc8c3
 2016-10-13 00:57:38 +00:00
Selim Cinek
1c042cc6c3 Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev am: d517c3c16b 
am: 531099ae14

Change-Id: I7b05e1c54ed2ed759b5d92180edbfbdda2df841c
 2016-10-13 00:56:39 +00:00
dooyoung.hwang
9b1500b1dd Fix crashes after notifying bad notification am: 78c4114101 
am: 08011cdf33

Change-Id: I679181fb5f23c48825c21d9a210e70eaca3835f2
 2016-10-13 00:55:49 +00:00
Selim Cinek
bf8694c933 Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev am: 7ce68fd8a4 
am: f3eb11bdc1

Change-Id: I126575e006e20a008cfe44a370f026a81d73d267
 2016-10-13 00:54:53 +00:00
Selim Cinek
7356abc6f4 Fixed an issue where the emergency affordance would show am: bd740cd56a 
am: c46b2ef8d2

Change-Id: Ice913b2ace0dc3962cd3b048ba847f4050c29cce
 2016-10-13 00:53:56 +00:00
Selim Cinek
6f3a05ae77 Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" 2016-10-13 00:48:24 +00:00
Treehugger Robot
d33e79c328 Merge "DO NOT MERGE - Added translations for emergency action string" 2016-10-13 00:45:20 +00:00
Selim Cinek
77988e4aec Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev 
am: 0bdfc7be66

Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74
 2016-10-13 00:44:21 +00:00
Selim Cinek
c19b510454 Fixed a bug where the system could crash when expanding 
am: 3e77984434

Change-Id: Icf8c8743f57a5e402275adfc645f08a10cf94a3b
 2016-10-13 00:44:16 +00:00
Selim Cinek
531099ae14 Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev 
am: d517c3c16b

Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518
 2016-10-13 00:42:47 +00:00
dooyoung.hwang
08011cdf33 Fix crashes after notifying bad notification 
am: 78c4114101

Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54
 2016-10-13 00:42:44 +00:00
Selim Cinek
f3eb11bdc1 Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev 
am: 7ce68fd8a4

Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6
 2016-10-13 00:41:27 +00:00
Selim Cinek
c46b2ef8d2 Fixed an issue where the emergency affordance would show 
am: bd740cd56a

Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
 2016-10-13 00:41:24 +00:00
Selim Cinek
0bdfc7be66 Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev 2016-10-13 00:37:29 +00:00
Selim Cinek
d517c3c16b Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev 2016-10-13 00:36:29 +00:00
Selim Cinek
7ce68fd8a4 Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev 2016-10-13 00:29:59 +00:00
Christopher Tate
edd8dc83d5 Retain allowBackup annotation when system+lock wallpaper becomes lock only 
Bug 32069467

Change-Id: I5d0b91c40e1a2896f2b11efeef7bff84503cf2c0
 2016-10-13 00:00:53 +00:00
Adrian Roos
85d2112335 Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev am: 5c8fc58850 
am: b920d48e0a

Change-Id: Ie7d699fa304be1b75e7037d75c02ab5302a3205d
 2016-10-12 23:26:15 +00:00
Adrian Roos
7bc84b803d Fix Notification.Action.Builder copy constructor am: 7af5362571 
am: 342bc437bf

Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
 2016-10-12 23:25:20 +00:00
Selim Cinek
42a4338850 DO NOT MERGE - Added translations for emergency action string 
Bug: 30404490
Change-Id: Ic20d93005882bb71cef32a705443e427b0a9bd71
 2016-10-12 23:23:52 +00:00
Selim Cinek
4df8d64dab DO NOT MERGE - Fixed an issue where the emergency affordance would show 
If a device isn't voice capable, it shouldn't show the emergency
option.

Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug: 31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
 2016-10-12 23:20:30 +00:00
Adrian Roos
b920d48e0a Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev 
am: 5c8fc58850

Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7
 2016-10-12 23:19:22 +00:00
Adrian Roos
342bc437bf Fix Notification.Action.Builder copy constructor 
am: 7af5362571

Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7
 2016-10-12 23:19:19 +00:00
TreeHugger Robot
5c8fc58850 Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev 2016-10-12 23:11:22 +00:00
Adrian Roos
7af5362571 Fix Notification.Action.Builder copy constructor 
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.

Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
 2016-10-12 15:19:55 -07:00
Robert Greenwalt
6f8c54a16d Merge "Add free short codes for direct carrier billing and others" 
am: 73c50f7dbc

Change-Id: I1c6fbd6107cf7a6819c6d7f42c5639fa029be54f
 2016-10-12 22:16:14 +00:00
Robert Greenwalt
73c50f7dbc Merge "Add free short codes for direct carrier billing and others" 2016-10-12 22:05:32 +00:00
Adam Lesinski
baee508ba9 Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev am: baac85ec1f 
am: cde80e68c6

Change-Id: I445fb76e38d34e2df74ff61cfd4b1ce6166a7265
 2016-10-12 21:10:41 +00:00
Martin Wallgren
3970c44547 RRO: Synchronize access to overlays.list am: 0fbb608110 
am: dce79f10ba

Change-Id: Idc121ffe64f1bc7b5bdcb1a800305165f27f1c0a
 2016-10-12 21:09:42 +00:00
Doris Liu
d3725ee017 Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am: 269f76a7d2 
am: 64d24d6631

Change-Id: Id6964ab08d4443a3ad4932a9ed25751c922a411a
 2016-10-12 21:04:16 +00:00
Doris Liu
1ef744a3b8 Fix SkShader leak for Gradient VectorDrawable and test am: fc9cf72339 
am: c47199bb6a

Change-Id: I261f8f3708f526c15ae93c51d24bdaee054354f6
 2016-10-12 21:03:14 +00:00