drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,761 Commits 1 Branch 0 Tags
Commit Graph

251761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ae9fa16bd0 Merge "[DO NOT MERGE] Backup account access grants" into nyc-mr1-dev 2016-09-10 00:04:28 +00:00
Sungsoo Lim
75a07e44c5 Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab am: 883a724193 am: ba9aa89cfe -s ours am: 034401cfaf 
am: 4443c42d7d

Change-Id: Iac823ef7d5c21d956760dfeac8c484db1a6a5ab1
 2016-09-09 23:50:50 +00:00
Sungsoo
db86d99015 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813 am: 45e14ffec6 am: 5906630ad7 -s ours am: 85446272d3 
am: 4098d6507f

Change-Id: Id98427978d37dcee69a3ecd63c70f638ce93687c
 2016-09-09 23:50:47 +00:00
Sungsoo Lim
4443c42d7d Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab am: 883a724193 am: ba9aa89cfe -s ours 
am: 034401cfaf

Change-Id: I48a8d054110bfbf7f3e7b6b2e5829bfabd8f6133
 2016-09-09 23:46:11 +00:00
Sungsoo
4098d6507f DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813 am: 45e14ffec6 am: 5906630ad7 -s ours 
am: 85446272d3

Change-Id: I065c3361d5bf2c495243c1a5da2d5dae46f03eb8
 2016-09-09 23:46:06 +00:00
Sungsoo Lim
034401cfaf Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab am: 883a724193 
am: ba9aa89cfe  -s ours

Change-Id: Ic85cbc0ad279e0c8e8859b066ec98638cfbd1cec
 2016-09-09 23:38:54 +00:00
Sungsoo
85446272d3 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813 am: 45e14ffec6 
am: 5906630ad7  -s ours

Change-Id: If39f3ad11006c270690a6621dfa0c16d7b74e68c
 2016-09-09 23:38:34 +00:00
Sungsoo Lim
ba9aa89cfe Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab 
am: 883a724193

Change-Id: I3766dbd982ea51e8f7429da76bce8b9feebbfe8d
 2016-09-09 23:07:52 +00:00
Sungsoo
5906630ad7 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813 
am: 45e14ffec6

Change-Id: I1a6d79242b6f972dca5bb7eb6ddd37960b1cd4f9
 2016-09-09 23:07:49 +00:00
TreeHugger Robot
3d60893532 Merge "Remove the reference to android.support.v7.widget.Space" into nyc-mr1-dev 2016-09-09 23:03:19 +00:00
Sungsoo Lim
883a724193 Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c 
am: bcc0e5a7ab

Change-Id: I03932a82253351dd46dee8bdd7e8910bd5862410
 2016-09-09 22:55:14 +00:00
Sungsoo Lim
07682b728d Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev am: c60f995ae9 
am: 6df90df83c

Change-Id: I6bd28a829dfbb5056b860c8667e17defcc632e5c
 2016-09-09 22:55:14 +00:00
Sungsoo
45e14ffec6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc 
am: 865bf88813

Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
 2016-09-09 22:55:11 +00:00
Sungsoo
59b98a870d DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 56ea7b4901 
am: 9a420bb0f6

Change-Id: I311bf018bd114397dc1b54986aa2e8f7e7915de4
 2016-09-09 22:55:11 +00:00
Sungsoo Lim
bcc0e5a7ab Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev 
am: 987472290c

Change-Id: Ida680d7915f1774e1f4b2cf94d38c384d50c0e64
 2016-09-09 22:47:09 +00:00
Sungsoo
865bf88813 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change 
am: 2ee53c82cc

Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
 2016-09-09 22:47:06 +00:00
Sungsoo Lim
6df90df83c Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev 
am: c60f995ae9

Change-Id: I91f906df707b351e082ba5444208ef24fb076534
 2016-09-09 22:46:53 +00:00
Sungsoo
9a420bb0f6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change 
am: 56ea7b4901

Change-Id: Iebcfced541a569bd441f45ff126075c2e87401c9
 2016-09-09 22:46:46 +00:00
Sungsoo Lim
c60f995ae9 Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev 2016-09-09 22:39:22 +00:00
Sungsoo Lim
987472290c Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev 2016-09-09 22:39:08 +00:00
Fyodor Kupolov
06f06dd228 Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev 
am: 05918fd123

Change-Id: I94f65a46948a26260aef08af18b8e4b2a5e1f7cb
 2016-09-09 21:40:58 +00:00
Fyodor Kupolov
b8310b6b25 Fixed a bug with incorrect handling of onUnlockUser 
am: 0f57cce644

Change-Id: I316808e7d3ff978dd3eb56a2f5a998f374a1aeab
 2016-09-09 21:40:54 +00:00
Fyodor Kupolov
05918fd123 Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev 2016-09-09 21:36:03 +00:00
TreeHugger Robot
b548ae5d5f Merge "Fix duplicate entries in ChooserActivity" into nyc-mr1-dev 2016-09-09 21:31:04 +00:00
Hall Liu
265fcad145 Merge "Add configurable emergency call number support" into nyc-mr1-dev 2016-09-09 20:48:44 +00:00
Chien-Yu Chen
d0948a053f Merge "CameraJNI: Fix memory leak in stop recording." into nyc-mr1-dev 2016-09-09 20:09:49 +00:00
TreeHugger Robot
295f5108f1 Merge "Add filter ordering" into nyc-mr1-dev 2016-09-09 19:59:46 +00:00
TreeHugger Robot
b64095df86 Merge "Invoke service w/ action" into nyc-mr1-dev 2016-09-09 19:50:36 +00:00
Daniel Nishi
e64b7a0656 Merge "Fix a bug where the Deletion Helper could not delete packages." into nyc-mr1-dev 2016-09-09 19:43:12 +00:00
TreeHugger Robot
c1c0421f67 Merge "Hold a weak reference to PointerController when handling vsync" into nyc-mr1-dev 2016-09-09 19:28:10 +00:00
TreeHugger Robot
163f8eac70 Merge "Fix issues with SHOW_WHEN_LOCKED windows" into nyc-mr1-dev 2016-09-09 19:17:46 +00:00
Vladislav Kaznacheev
8fdbce9d6c Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev am: 148ccbb082 
am: b0666c61b1

Change-Id: I0eeed59707162085194858e3ec0349291503c0c4
 2016-09-09 18:47:44 +00:00
Vladislav Kaznacheev
c9bab3001f Update JavaDoc for DragEvent.getLocalState am: 048f3bfaf0 
am: fa05df640f

Change-Id: I535a5218bec2f5cf0ea9fa83aaa92ab70f05fcdd
 2016-09-09 18:47:41 +00:00
Vladislav Kaznacheev
b0666c61b1 Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev 
am: 148ccbb082

Change-Id: I0933f7f9f2180462b173fc2ca0ef23bfe464b1b5
 2016-09-09 18:42:42 +00:00
Vladislav Kaznacheev
fa05df640f Update JavaDoc for DragEvent.getLocalState 
am: 048f3bfaf0

Change-Id: I72bec54ac999ebce5779062ddc5effd1bb4d61ce
 2016-09-09 18:42:34 +00:00
TreeHugger Robot
148ccbb082 Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev 2016-09-09 18:34:59 +00:00
Fyodor Kupolov
0f57cce644 Fixed a bug with incorrect handling of onUnlockUser 
userId should be passed as arg1 instead of obj.

Bug: 31321500
Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc
 2016-09-09 10:36:30 -07:00
Adam Powell
00e587086b Fix duplicate entries in ChooserActivity 
Fix use of wrong index when checking for duplicates.

Bug 31234526

Change-Id: Ia37d1b04a9054b8d90957057db857633e4b79569
 2016-09-09 10:26:35 -07:00
Svet Ganov
72ed12c55f [DO NOT MERGE] Backup account access grants 
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). If the sync adapter
does not have permission to access the account we ask the
user to grant access and take a note. This CL adds backup
for the explicit user grants.

bug:31162498

Change-Id: I31e3f3d010475352c7c54255ac2d3a2fed4d0c72
 2016-09-09 10:16:57 -07:00
Vladislav Kaznacheev
33c5903e77 Hold a weak reference to PointerController when handling vsync 
Currently PointerController starts listening to display events
immediately (in its constructor) and never explicitly removes
the callback. The reference dangling from the looper
prevents the PointerController instance from being deleted
when all the clients have released their references.

As a result, when USB or BT mouse is disconnected,
the mouse stays frozen on screen and only goes away
after a 15 sec inactivity timeout.

This change introduces an intermediary LooperCallback
which holds only a weak reference to PointerController.
The pointer now disappears immediately upon mouse
disconnect.

Bug: 30824220
Change-Id: I5f7208dbfa381b3e21f248cc0da402f307faa184
 2016-09-09 10:03:31 -07:00
Rob Carr
1b6e3e4824 Merge "Remove reuse of pending deferred transactions." into nyc-mr1-dev 2016-09-09 16:37:51 +00:00
Robert Carr
5dc3f284bd Remove reuse of pending deferred transactions. 
Only defer transactions originating from repositionChild. There is
no guarantee the frame we are suggested to synchronize to will ever
arrive and synchronizing WM originated transactions to this can
interfere with implementation of system policy. Anyway this code
originally was fixing a case where transactions pushed by pulling
down the notification shade, would interrupt animating SurfaceView's
by pushing an undeferred transaction for those SurfaceView's. This
doesn't seem to be occuring anymore even without this code. Furthermore
even if it was occuring, we should prevent transactions from pushing
updates for Surfaces where nothing has really changed, rather than
attempt to chain the deferred transactions.

Bug: 31293950
Bug: 27098060
Bug: 28858420
Change-Id: Ifb83fe78bb4e7d18376e53a743709648aa1e03bc
 2016-09-09 16:36:47 +00:00
Narayan Kamath
2fd160b0d4 Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf am: 19ebec6d36 
am: 2e8b25701a

Change-Id: If0cc333a2fa6bfadc0d4ac56049dc14e7066e38c
 2016-09-09 11:01:19 +00:00
Narayan Kamath
2e8b25701a Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf 
am: 19ebec6d36

Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469
 2016-09-09 10:52:43 +00:00
Narayan Kamath
7a4882a895 Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c am: eb972e5d9d am: 7aba7234e1 
am: d1697846ba

Change-Id: If4553a6075d24cea4398b035abea26db9998313f
 2016-09-09 10:52:40 +00:00
Narayan Kamath
19ebec6d36 Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc 
am: e9295560cf

Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5
 2016-09-09 10:44:54 +00:00
Narayan Kamath
d1697846ba Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c am: eb972e5d9d 
am: 7aba7234e1

Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea
 2016-09-09 10:44:45 +00:00
Narayan Kamath
7aba7234e1 Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c 
am: eb972e5d9d

Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
 2016-09-09 10:39:40 +00:00
Narayan Kamath
e9295560cf Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 
am: bd6a29cddc

Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1
 2016-09-09 10:39:29 +00:00
Narayan Kamath
eb972e5d9d Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 
am: 8cb6b9335c

Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
 2016-09-09 10:33:43 +00:00