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

42040 Commits

Author SHA1 Message Date
Tim Murray
44b7f75587 Merge changes I15da2563,I7845542d into nyc-mr1-dev am: 7b8b1aab93 
am: 619682b960

Change-Id: I98afd5bead70cf25ca43e49c1215ccef1e472a83
 2016-07-19 00:33:04 +00:00
Tim Murray
619682b960 Merge changes I15da2563,I7845542d into nyc-mr1-dev 
am: 7b8b1aab93

Change-Id: I66d92cd3c08a67598cefdc6256825b1c6c1736f5
 2016-07-19 00:25:52 +00:00
Tim Murray
7b8b1aab93 Merge changes I15da2563,I7845542d into nyc-mr1-dev 
* changes:
  Don't reset current thread's priority accidentally.
  add tracepoint for when the display chain is stuffed
 2016-07-19 00:20:02 +00:00
Dmitry Dementyev
9082c56ebd Merge \\\"Include correct account id in action_called_account_remove log message.\\\" into nyc-dev am: 0544462bf1 am: 33c20d39e3 
am: fa30cf747e

Change-Id: I4b8c59b7ae6035917d106741ba98b9c0a18d3b6c
 2016-07-18 23:59:00 +00:00
Dmitry Dementyev
fa30cf747e Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am: 0544462bf1 
am: 33c20d39e3

Change-Id: I8857fc1e39fbd9c2368e6f341a1c3cffaaaeaf16
 2016-07-18 23:53:52 +00:00
Dmitry Dementyev
d87be07644 Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev 
am: 0544462bf1

Change-Id: Iaedf8dbf5fb7ee68eebe1026ab3867f544948db9
 2016-07-18 23:48:59 +00:00
Dmitry Dementyev
33c20d39e3 Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev 
am: 0544462bf1

Change-Id: Ibc72de68280c0d859e8391654f4d67de66515800
 2016-07-18 23:48:53 +00:00
Dmitry Dementyev
0544462bf1 Merge "Include correct account id in action_called_account_remove log message." into nyc-dev 2016-07-18 23:37:31 +00:00
Jeff Sharkey
599fd5a8e6 Merge \\"Handle auto-unlocked managed profiles.\\" into nyc-mr1-dev am: 2b58e464bb 
am: 502087e464

Change-Id: I16b8beb110c534124475e7e0111a912ffa3e5799
 2016-07-18 23:23:39 +00:00
Jeff Sharkey
502087e464 Merge \"Handle auto-unlocked managed profiles.\" into nyc-mr1-dev 
am: 2b58e464bb

Change-Id: Idc9ecd57f65a9ad273407ca0ebc30ad7fd15dcc7
 2016-07-18 23:11:28 +00:00
Jeff Sharkey
2b58e464bb Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev 2016-07-18 23:02:46 +00:00
Tim Murray
e2279c6d23 Don't reset current thread's priority accidentally. 
If there's no RenderThread for the top app and FIFO UI is enabled, it's
possible to reset the current system_server thread's priority and
scheduler.

bug 30173296

Change-Id: I15da2563356ddd66911d695db43660ce5400da07
 2016-07-18 15:35:42 -07:00
Svetoslav Ganov
f6d56f92ff Merge "Update windows before sending a window state change event" 2016-07-18 21:54:14 +00:00
Adam Lesinski
daa3e9cd80 Merge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91 
am: d279c1291e

Change-Id: I6973342d48a8a8cebe8f4515c6d67d271dbcf7f7
 2016-07-18 21:29:56 +00:00
Hongming Jin
280a87d3a5 Merge "AccountManager: Make account session APIs public api." 2016-07-18 21:24:08 +00:00
Adam Lesinski
d279c1291e Merge \"Record UID of wakeup packets\" into nyc-mr1-dev 
am: 117cf8de91

Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f
 2016-07-18 21:15:48 +00:00
Jim Miller
6097da897a Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd 
am: 623362c5ab

Change-Id: I7d604ab0a4c76672a765a064011574cd427aac64
 2016-07-18 21:15:43 +00:00
Jim Miller
623362c5ab Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev 
am: 6ad9c16ffd

Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d
 2016-07-18 21:09:37 +00:00
TreeHugger Robot
117cf8de91 Merge "Record UID of wakeup packets" into nyc-mr1-dev 2016-07-18 20:58:15 +00:00
TreeHugger Robot
6ad9c16ffd Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev 2016-07-18 20:54:45 +00:00
Adam Lesinski
5f056f6d87 Record UID of wakeup packets 
Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
 2016-07-18 12:30:46 -07:00
Dmitry Dementyev
e59fc5fe55 Include correct account id in action_called_account_remove log message. 
Bug: 30013930

Change-Id: I857866e224d8dbc986c3b7e83a5f4e899e09f3ab
 2016-07-18 11:23:20 -07:00
Makoto Onuki
cd74b3050d Merge \\"Implement dumpsys --checkin for shortcut manager\\" into nyc-mr1-dev am: 121480cda8 
am: 3991a376e5

Change-Id: I3ccc92a0a9f6bfcce5207ef29db73063ec50a9f8
 2016-07-18 18:10:41 +00:00
Makoto Onuki
c69f21c357 Merge \\"Remove the DMAgent whitelisting\\" into nyc-mr1-dev am: bf6c6b44e1 
am: 41fa9fe0a4

Change-Id: I5bbe059464a8719b92bf16997482382c7de02e99
 2016-07-18 18:10:36 +00:00
Sudheer Shanka
d03dd1dcd3 Merge "Add more UserMananger related tests." 2016-07-18 18:06:28 +00:00
Makoto Onuki
3991a376e5 Merge \"Implement dumpsys --checkin for shortcut manager\" into nyc-mr1-dev 
am: 121480cda8

Change-Id: I38508e2b47dcb2fe2e8046f7c148b4ddbf6a2697
 2016-07-18 18:05:40 +00:00
Makoto Onuki
41fa9fe0a4 Merge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev 
am: bf6c6b44e1

Change-Id: I85b2fabd9f33697be15bccbaf8602fa525012772
 2016-07-18 18:05:36 +00:00
Makoto Onuki
121480cda8 Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev 2016-07-18 17:50:25 +00:00
Makoto Onuki
bf6c6b44e1 Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev 2016-07-18 17:50:18 +00:00
Chong Zhang
3f94a2e35c Merge "Remove two-finger scroll specific code" 2016-07-18 17:30:52 +00:00
Chong Zhang
2e2c81a8d6 Remove two-finger scroll specific code 
Revert changes in ag/845161, ag/843943 and ag/817515 that's added
specifically for two-finger scroll mode.

Change-Id: I8679a3bd5b3907180d33d99e3a071e7edfb2ed96
 2016-07-18 17:30:23 +00:00
Jeff Sharkey
ba0665705b Handle auto-unlocked managed profiles. 
There are cases where a managed profile provides an auth challenge
which is really an automatic unlock as a side effect from the parent
profile being unlocked.  Detect this case and suppress PRE_BOOT
notifications.

Bug: 29931646
Change-Id: I801605b0b59a7924bfe7f433415d9704664a5cbc
 2016-07-18 10:20:23 -06:00
Lorenzo Colitti
ef3ec0dd34 Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp 
am: 17450e41b3

Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
 2016-07-18 15:15:33 +00:00
Lorenzo Colitti
5dd90b15fb Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev 
am: b5239329b1

Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82
 2016-07-18 15:08:54 +00:00
TreeHugger Robot
b5239329b1 Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev 2016-07-18 15:00:21 +00:00
Ricky Wai
939edb0dbc Merge \\"Do not allow to disable package \\"android\\"\\" into nyc-mr1-dev am: a5111bfda4 
am: e9e9f30085

Change-Id: I6159402639a440849357bd4ccd53bc4cb8fbab7a
 2016-07-18 14:36:56 +00:00
Ricky Wai
e9e9f30085 Merge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev 
am: a5111bfda4

Change-Id: Ia983198d1c41848d78ef18ed189d6f68cbc39350
 2016-07-18 14:29:51 +00:00
Ricky Wai
a5111bfda4 Merge "Do not allow to disable package "android"" into nyc-mr1-dev 2016-07-18 14:22:28 +00:00
Ricky Wai
1a7b160ca5 Do not allow to disable package "android" 
Bug: 25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
 2016-07-18 14:29:53 +01:00
Julia Reynolds
5921f81724 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a
 2016-07-18 13:25:51 +00:00
Julia Reynolds
8f17d2a48b Merge "Check uid for notification policy access." into nyc-dev 2016-07-18 13:16:16 +00:00
Lorenzo Colitti
f4a45f4c33 Add an isListen method to NetworkRequests. 
This allows simplification of the ConnectivityService code.

Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
 2016-07-18 18:42:26 +09:00
Andreas Gampe
80c3459b3f Frameworks/base: Fix braino missing line am: 06eb24d95e 
am: 46d5eca989

Change-Id: I6cdcd67e7bed24819eac5e11fc775ef8f243a8e0
 2016-07-16 02:43:56 +00:00
Andreas Gampe
46d5eca989 Frameworks/base: Fix braino missing line 
am: 06eb24d95e

Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
 2016-07-16 02:38:18 +00:00
Andreas Gampe
06eb24d95e Frameworks/base: Fix braino missing line 
This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
 2016-07-15 18:13:48 -07:00
Jim Miller
29d157bf05 Fix vulnerability in LockSettings service 
Fixes bug 30003944

Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
 2016-07-15 17:28:53 -07:00
Amith Yamasani
973fe42f8f Merge \\"Block camera gesture during secondary user SUW\\" into nyc-mr1-dev am: e1a3a449a4 
am: d0cecf9d67

Change-Id: I675832bc2c88477c8cf5e70f30a5b8e9b25048ff
 2016-07-16 00:22:04 +00:00
Amith Yamasani
d0cecf9d67 Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev 
am: e1a3a449a4

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84
 2016-07-16 00:12:03 +00:00
TreeHugger Robot
e1a3a449a4 Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev 2016-07-16 00:03:52 +00:00
Makoto Onuki
17e94691c2 Merge \\"Don\\'t accept resource references in string fields\\" into nyc-mr1-dev am: 6fa0e4d518 
am: 3d3e2e2b17

Change-Id: Ib5a83728239cfa074fb9800b76bc217dcf990b30
 2016-07-15 23:56:03 +00:00