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

51034 Commits

Author SHA1 Message Date
TreeHugger Robot
209abb290c Merge "Cleanup that wasn't uploaded with ag/2094132" 2017-04-15 00:02:29 +00:00
Philip P. Moltmann
fe48dab741 Merge "Fix some racines in AutofillManager" into oc-dev am: 2ddd69ce1a 
am: ae774ec189

Change-Id: Ic035560141f16118a4fefb3bb0f65edd6bd228cc
 2017-04-14 22:16:02 +00:00
Philip P. Moltmann
ae774ec189 Merge "Fix some racines in AutofillManager" into oc-dev 
am: 2ddd69ce1a

Change-Id: Iec8454a36985484148b821f598446d5305c601bc
 2017-04-14 22:11:06 +00:00
Badhri Jagan Sridharan
2d08709300 Merge "Repost USB and ADB notification when locale changes" 2017-04-14 21:58:24 +00:00
Philip P. Moltmann
e048a65639 Fix some racines in AutofillManager 
- The session might be gone by the time the handler is called, hence check
  the sessionID
- Access getClientLocked() and mSession only under mLock.

Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
 2017-04-14 12:50:03 -07:00
Christopher Tate
ff2c721bff Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 
am: 09414003f5

Change-Id: Ibe8fb54fd2b10227e08d887b69767d472c098b7e
 2017-04-14 19:19:19 +00:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
 2017-04-14 19:09:27 +00:00
Julia Reynolds
ca7b2e3e71 Merge "Synchronize access to ranking helper records." into oc-dev am: bf777d46f2 
am: 00ac29e3dd

Change-Id: Ic6fec9eda6c3302d4893c6f5929ba5d8e8341850
 2017-04-14 19:05:09 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Julia Reynolds
6ad85d8211 Merge "Lock access to managed services." into oc-dev am: 8ac1452288 
am: 7e0a00e387

Change-Id: Ibe3e760716ff2ccfbb1432bbe431de33348d8cb0
 2017-04-14 19:03:58 +00:00
Badhri Jagan Sridharan
82d49dfbef Repost USB and ADB notification when locale changes 
Bug: 37266276
Test: Manually tested the language of active notifications after
switching language.

Change-Id: I0cef61fbd155e0c9789f52a140561c71969fbab7
 2017-04-14 12:01:59 -07:00
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev 
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
 2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Tsukasa Hashimoto
9191faf4eb Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 am: 5dbe26f0f1 
am: 4ae323995d

Change-Id: I2d83b2c741c8d6cbf730d093adc59ec80bf1899d
 2017-04-14 18:37:20 +00:00
Wale Ogunwale
0e502c0250 Merge "Move stack to front in-sync with task reparenting" into oc-dev am: c4555784be 
am: 7654775b8a

Change-Id: Icdfa610740ae34fe46e83dd3b604651392466ad9
 2017-04-14 18:34:34 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev 
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
 2017-04-14 18:34:01 +00:00
Svet Ganov
68cd99ecee Fix NPE in autofill am: 833c68e9fd 
am: 651a974dd1

Change-Id: I3227f1272f123c8de934c4c22d6ebc1355ddf7b5
 2017-04-14 18:33:22 +00:00
Daniel Nishi
44f3507dfc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev am: 864d53d6fc 
am: 33f74edaa4

Change-Id: Ifd1b2a4c522cb87bed58b47653292567a48c7aa2
 2017-04-14 18:32:11 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
Alan Viverette
14b3375e43 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b 
am: efc602c307

Change-Id: Id991d413933d8435a05b129bf13e917941371c01
 2017-04-14 18:25:53 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
 2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822 
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
 2017-04-14 18:13:50 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede 
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
 2017-04-14 18:01:24 +00:00
Hugo Benichi
f24e74942b Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3 
am: 43cdbc943d

Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
 2017-04-14 17:55:26 +00:00
Winson Chung
ebb2bbba57 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am: 2e86be7653 
am: 3a32d35723

Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
 2017-04-14 17:53:03 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev 
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
 2017-04-14 17:41:52 +00:00
Svet Ganov
651a974dd1 Fix NPE in autofill 
am: 833c68e9fd

Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
 2017-04-14 17:40:40 +00:00
Winson Chung
e0c9bc1582 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am: 4191d99614 
am: 7031cdda50

Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
 2017-04-14 17:40:39 +00:00
Svet Ganov
19feef5229 Merge "Allow custom buttons in autofill UI" into oc-dev am: 249c4d709a 
am: 489cef380a

Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085
 2017-04-14 17:38:13 +00:00
Dmitry Dementyev
25b5fa9d79 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 
am: 0bf753d2e5

Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
 2017-04-14 17:33:46 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Svet Ganov
833c68e9fd Fix NPE in autofill 
Test: manual

bug:37330744

Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
 2017-04-14 17:29:51 +00:00
Christopher Tate
b72714ee23 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp 
am: c1c3855397

Change-Id: I6c2c43156183ac5389d4ce1b1df94b517540e384
 2017-04-14 17:26:00 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
 2017-04-14 17:18:40 +00:00
Daniel Nishi
864d53d6fc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 2017-04-14 17:11:30 +00:00
Julia Reynolds
4401196798 Synchronize access to ranking helper records. 
Fixes: 36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.

Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
 2017-04-14 17:06:03 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
Jorim Jaggi
b595d2a08c Merge "Don't consider app as top app if alpha = 0" into oc-dev am: 4a2be133d4 
am: 054a99d029

Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
 2017-04-14 17:01:19 +00:00
Julia Reynolds
00314d97e9 Lock access to managed services. 
Fixes: 35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.

Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
 2017-04-14 12:59:47 -04:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Wale Ogunwale
2719cc134e Move stack to front in-sync with task reparenting 
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.

Test: manual
Bug: 37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
 2017-04-14 09:45:27 -07:00
Jean-Michel Trivi
dc36701751 Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf 
am: 350b39fbc8

Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
 2017-04-14 16:16:46 +00:00
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d 
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
 2017-04-14 16:12:49 +00:00
Bryce Lee
5aa7e073bc Merge "Remove window container from empty task when destroying." into oc-dev am: 61bce9ab13 
am: a27128b8c7

Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
 2017-04-14 16:06:48 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050 
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
 2017-04-14 16:04:32 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3 
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
 2017-04-14 16:01:58 +00:00
Geoffrey Pitsch
e1a00e34db Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am: c4ca1b5677 
am: aa8dcf3751

Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
 2017-04-14 15:58:22 +00:00
Todd Kennedy
5fb012e45d Merge "Filter instant app content providers" into oc-dev am: 3891674204 
am: 0bb486bcb4

Change-Id: If96297cade9909d744eb57669aecd96841a27a31
 2017-04-14 15:42:02 +00:00
Chris Tate
d593e402c2 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9 
am: 636915a2ed

Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
 2017-04-14 15:34:16 +00:00