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

316317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
03758701fb Merge "Fix API feedback on Color" into oc-dev 2017-04-14 20:42:19 +00:00
Hangyu Kuang
5ba5e9182c media: Address API review comments 
Change setNextOutputFile to accept File instead of String. Also add new version
of setOutputFile to accept File.

Bug: 36791064
Test: CTS test.
Change-Id: I1a3d574e7cf36acbf181407131bc9dbf114d30de
 2017-04-14 13:41:01 -07:00
Mady Mellor
4b7b01c1cc Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 2017-04-14 20:40:03 +00:00
Nathan Harold
cd9d4b1491 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev am: 9361283073 
am: 3ce4d95d22

Change-Id: Ib34939764f9f347ad245c3497d36ed61c093e8eb
 2017-04-14 20:35:47 +00:00
Wale Ogunwale
5e8ecb0f34 Reduce effect on PipMenuActivity during animation 
- Set windowDisablePreview to true so no starting window is added for
the pip menu activity.
- setDisablePreviewScreenshots() so we don't waste time taking
screenshot for the pip menu activity.

Test: manual
Change-Id: I327603b9b0edc0baff779b00c8f6f035852aad15
 2017-04-14 13:32:19 -07:00
Nathan Harold
3ce4d95d22 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
am: 9361283073

Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
 2017-04-14 20:28:56 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
 2017-04-14 20:21:17 +00:00
Andrew Zeng
4caeaa4449 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp 
am: 7750ab39b2

Change-Id: Id41aad8e09009a52be5731de1679d154757c935f
 2017-04-14 20:18:39 +00:00
Andrew Zeng
a4b3107ba7 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 -s ours am: d210ce63d0 
am: 1ba83de49e

Change-Id: I3d173b0b3c01129ba44118d749369c535e783bde
 2017-04-14 20:13:42 +00:00
Nathan Harold
04908fcd17 Update doc string for getForbiddenPlmns() to READ_PHONE_STATE 
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
 2017-04-14 13:13:11 -07:00
Android Build Merger (Role)
7750ab39b2 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp 2017-04-14 20:11:00 +00:00
Andrew Zeng
1834250bbe Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 
am: 45bd03914c  -s ours

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

Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
 2017-04-14 20:08:35 +00:00
Rebecca Silberstein
24f9dcb9e5 Add a default SSID prefix for local only hotspot 
Add a default prefix for local only hotspot that will be used to
generate WifiConfiguration objects.  This prefix will have
random digits appended to reduce AP name collisions.

Bug: 36704909
Test: compiles

Change-Id: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
Merged-In: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
 2017-04-14 13:04:15 -07:00
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