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

316302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Zeng
d210ce63d0 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573  -s ours

Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
 2017-04-14 20:03:20 +00:00
Andrew Zeng
45bd03914c Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573

Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
 2017-04-14 20:02:57 +00:00
Andrew Zeng
812594f573 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 
am: 2c42db20e4  -s ours

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
 2017-04-14 19:52:58 +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
Andrew Zeng
2c42db20e4 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 2017-04-14 19:40:57 +00:00
Adrian Roos
8c4a48f389 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev am: b160141698 
am: a1da551856

Change-Id: I15b1d29ae469449c3861c2b743cf4b28e777108a
 2017-04-14 19:40:20 +00:00
Adrian Roos
a1da551856 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 
am: b160141698

Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
 2017-04-14 19:35:31 +00:00
Michael Kwan
15eb998e65 Add isSmallBatteryDevice flag to ActivityManager. 
Bug: 37351903
Change-Id: I6fed08c35474b10987388070eafb7b16e6944638
 2017-04-14 12:34:46 -07:00
TreeHugger Robot
b160141698 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 2017-04-14 19:24:40 +00: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
Hall Liu
53ba92d4fd Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad am: 8fa1c9c899 am: 00cf4637d2 
am: 1dd67517ab

Change-Id: I1ea556033515abc44d19e24e5ccc9412e4f3404c
 2017-04-14 19:12:30 +00:00
Android Build Merger (Role)
09414003f5 Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 2017-04-14 19:10:55 +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
Hall Liu
1dd67517ab Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad am: 8fa1c9c899 
am: 00cf4637d2

Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b
 2017-04-14 19:06:37 +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
Jason Monk
48edc0c628 Convert signal icon to be custom drawable 
This will make it really easy to change the number of bars it
displays.

Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes: 35902355
 2017-04-14 15:04:09 -04: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
Matt Sarett
00ce770070 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev am: 101dc265a8 
am: 7e92ac449b

Change-Id: Ic50bd5fe0358390024bdb9a34e14906dba669f25
 2017-04-14 19:02:54 +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
Hall Liu
00cf4637d2 Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad 
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
 2017-04-14 18:43:19 +00:00
Hall Liu
8fa1c9c899 Merge "Helper method in VideoCallImpl for testing" 
am: 14d27fccad

Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
 2017-04-14 18:39:18 +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
Vikas Marwaha
8b5315f588 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b 
am: 358ec57382

Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9
 2017-04-14 18:36:10 +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
Hall Liu
14d27fccad Merge "Helper method in VideoCallImpl for testing" 2017-04-14 18:30:26 +00:00
Matt Sarett
7e92ac449b Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 
am: 101dc265a8

Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
 2017-04-14 18:29:16 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
Dongwon Kang
625df43c5c Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874 
am: 294176e988

Change-Id: I7332f731883c94f49477258357b3b392b4e21961
 2017-04-14 18:27:05 +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
Alan Viverette
568b59c62c Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89 
am: 2de6b0dab0

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
 2017-04-14 18:24:27 +00:00
TreeHugger Robot
101dc265a8 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 2017-04-14 18:21:46 +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
Chad Brubaker
65cf224a3a Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am: 8ee12087e6 
am: 4ad2d2b4d0

Change-Id: I784ba8d936046e65bcec1612ba77ff8aaba26975
 2017-04-14 18:18:33 +00:00
Hugo Benichi
61bfec0cbd Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 am: e505b37ec5 
am: 9b7453f3c6

Change-Id: I04d6b51bef76c8937227c038c5825ed486812b71
 2017-04-14 18:17:31 +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
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
 2017-04-14 18:13:49 +00:00
Roozbeh Pournader
3f01530a68 Support overriding display locale for SuggestedLocaleAdapter 
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.

Fixes: 31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
 2017-04-14 11:13:27 -07:00
Tsukasa Hashimoto
5d57502c89 Merge "Add PID info into ANR crash log header" 
am: 2fe972c822

Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
 2017-04-14 18:09:56 +00:00
Seigo Nonaka
24c6464663 Merge "Use provided style for fallback font selection" into oc-dev am: 43112fd26e 
am: 83c52e0a40

Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
 2017-04-14 18:09:55 +00:00
Hugo Benichi
752fa520d7 Merge "Captive portal: rotate fallback urls" into oc-dev am: a622b24d3a -s ours 
am: af18992066  -s ours

Change-Id: I86641338b2551a9b0136704dcfeed6327c639407
 2017-04-14 18:07:43 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Jorim Jaggi
b4c52d616c Merge "Implement new splash screen API" into oc-dev am: 46ae660bf2 
am: 27af670d9a  -s ours

Change-Id: I4f772359bf0dab72caa298597da2a995db463979
 2017-04-14 18:05:30 +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