Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,540 Commits 3 Branches 0 Tags
de6aeaae7e6535339c75c5424e1230e2baab046a
Commit Graph

69427 Commits

Author SHA1 Message Date
Sailesh Nepal
607c51aadb resolve merge conflicts of 2cff241 to master 
Change-Id: Ide7a24bb36c51a24bd4107c3042efc3117ea76f6
 2016-08-23 08:10:12 -07:00
Sailesh Nepal
2cff2417cd resolve merge conflicts of ad31603 to cw-f-dev 
am: bbfb97461d

Change-Id: I8c497533297df55ef4aac85ca2d0d981a057b9d4
 2016-08-23 14:15:31 +00:00
Sailesh Nepal
bbfb97461d resolve merge conflicts of ad31603 to cw-f-dev 
Change-Id: I970fe17c234f9b99142980f685c3c4efee4767fc
 2016-08-23 07:04:30 -07:00
Doris Liu
c6b92a5979 Merge "Fix out of order listener callback for animator set containing empty sets" 2016-08-22 23:34:25 +00:00
TreeHugger Robot
6dcbcc9f9b Merge "Remove EXTRA_SHOW_FILESIZE." 2016-08-22 21:43:16 +00:00
Doris Liu
f66d2f6f31 Fix out of order listener callback for animator set containing empty sets 
BUG: 31016584

CTS test for this fix is added at:
https://googleplex-android-review.git.corp.google.com/#/c/1348858/

Change-Id: I9427a6791f4e0aafc33f5cc9fac16c3518d1cdbe
 2016-08-22 14:30:48 -07:00
Steve McKay
0a38e2318b Remove EXTRA_SHOW_FILESIZE. 
DocumentsUI will always show size.

Bug: 31016724

Change-Id: I19150332529c4699f00f7f239f775e89025f1c3f
 2016-08-22 20:09:11 +00:00
Bo Liu
ad94857d90 Merge "WebView: Use static factory method to create provider" 2016-08-22 16:25:10 +00:00
Chris Banes
b62db80a04 Fix NPE in ForwardingListener - fw edition 
Caused by a postDelayed() and lack of
null check

BUG: 29992695
Change-Id: If2f43736505e0f738e9d0cf941a1f2d828cd8d5d
 2016-08-22 10:16:21 +00:00
Bo Liu
4827385ae7 WebView: Use static factory method to create provider 
This gives the implementation the flexibility to choose different
provider instances. Fallback to constructor if static initializer
factory method doesn't exist.

Change-Id: I72fa0c51c64d0dbdeb6234a0ab4fdd0a389b09fc
 2016-08-20 16:13:25 -07:00
TreeHugger Robot
27a395c06d Merge "Clean up style issues in ArraySet." 2016-08-20 04:15:21 +00:00
TreeHugger Robot
3a5b710684 Merge "Added a uidPoliciesToString() method." 2016-08-20 02:29:41 +00:00
Aurimas Liutikas
f2a45b269d Clean up style issues in ArraySet. 
Clean up style issues in preparation to copying ArraySet
implementation to support library.

Fixed:
- Missing spaces around operators, casting
- Added curly braces around if statements that span multiple lines
- Renamed static variables to follow sFoo instead of mFoo
- Moved = to the previous line

Bug: 19109652
Change-Id: Id9a985723b158f51811b3cd796613d0e26fd7e61
 2016-08-19 16:36:19 -07:00
Etan Cohen
5782aae1be [NAN] Udpate NAN API documentation, clean-up visibility 
am: 2e37b06dde

Change-Id: Iba3682d9ce1a3d2d1bd07636ef7c633d8e7ed847
 2016-08-19 23:21:52 +00:00
Phil Weaver
31f764496f Dispatch a11y events in separate thread. am: c34649411d 
am: d4847f282d

Change-Id: I0e55dfc4563418ebe30a690fa2348a8093187fde
 2016-08-19 23:08:51 +00:00
Phil Weaver
d4847f282d Dispatch a11y events in separate thread. 
am: c34649411d

Change-Id: Ie19da4e16b9bc78574545bbba1d44f28ef065b3d
 2016-08-19 22:46:13 +00:00
Etan Cohen
c6a6a0e7ba Merge "resolve merge conflicts of 6ffbcb3 to master" 2016-08-19 22:07:26 +00:00
Todd Kennedy
84cc3282db Merge "remove mention of file: URIs for package installs" 2016-08-19 21:36:29 +00:00
Etan Cohen
2e37b06dde [NAN] Udpate NAN API documentation, clean-up visibility 
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
 2016-08-19 12:31:31 -07:00
Ta-wei Yen
ad31603b80 Add carrier regex config values for VisualVoicemailSmsFilter 
Verizon requires all SMS that starts with "//VZWVVM" to be treated
as a VVM SMS.

EXTRA_VOICEMAIL_SMS_MESSAGE_BODY is also added to VociemailContract
to send the message body of a SMS that matches the carrier regex but
is not parsable.

Bug: 30954955
Change-Id: Ib5449164a5290b132648cc28b1e1d3d9ddd5fea0
 2016-08-19 11:43:15 -07:00
Etan Cohen
ccb0b65be6 resolve merge conflicts of 6ffbcb3 to master 
Change-Id: I23af5223f0e9810aa90fda4594ff6ccfc69b4053
 2016-08-19 11:22:06 -07:00
Etan Cohen
6ffbcb3f73 Merge "[NAN] Provide calling package name to service" into mm-wireless-dev 2016-08-19 17:23:15 +00:00
André Lago
13a5df3b31 Merge changes from topic 'Different sound settings for work profile' 
* changes:
  [media] Separate ringtones for managed profiles
  [Settings] Added setting SYNC_PARENT_SOUNDS
 2016-08-19 17:02:05 +00:00
Felipe Leme
b146f7678f Added a uidPoliciesToString() method. 
BUG: 28791717
Change-Id: Ib26e08332d011ca5414406810cec4b4936841068
 2016-08-19 09:52:16 -07:00
Phil Weaver
c34649411d Dispatch a11y events in separate thread. 
Moves the IPCs into a separate thread, where they should affect
jank a lot less.

Bug: 30183085
Change-Id: Ib76159d158e7a867e76cdd5c8ea3a318949fcc5b
 2016-08-19 09:22:10 -07:00
Andreas Huber
8dcbf8ba43 Merge "Support one-way methods in java support for hardware binder." 2016-08-19 15:53:13 +00:00
Todd Kennedy
9cc589a3a0 remove mention of file: URIs for package installs 
they're not supported

Change-Id: Id274ee6065ba531c01ad720ac0a53fb97e0fc687
Fixes: 6517618
 2016-08-18 16:23:17 -07:00
George Mount
05051ef82b Fix NPE during Activity transition using wrong Activity. am: a3edbf6a5d 
am: 34abaebd3b

Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f
 2016-08-18 22:37:21 +00:00
George Mount
34abaebd3b Fix NPE during Activity transition using wrong Activity. 
am: a3edbf6a5d

Change-Id: Ie6ca8f9f9f251eaf844f842e0f6f0ab36a975c1e
 2016-08-18 22:32:08 +00:00
Andreas Huber
8aa4d8cd29 Support one-way methods in java support for hardware binder. 
Bug: 30922538
Change-Id: I5ff93126a29f6bff42dee3f9868fa794ca7c077f
 2016-08-18 14:29:40 -07:00
Ned Burns
be92fca27c Merge "Add ViewConfiguration.getScaledScrollFactor()" 2016-08-18 21:16:49 +00:00
Ned Burns
69af432039 Add ViewConfiguration.getScaledScrollFactor() 
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.

Change-Id: I537af010610bb374ab29a41aff4fae5b07bece6e
 2016-08-18 15:07:05 -04:00
George Mount
a3edbf6a5d Fix NPE during Activity transition using wrong Activity. 
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289)
 2016-08-18 17:15:43 +00:00
TreeHugger Robot
b67b8a6d6c Merge "Fix NPE during Activity transition using wrong Activity." 2016-08-18 17:13:53 +00:00
Narayan Kamath
34c1b813ae Process: Fix communication with zygote. 
Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry picked from commit 448be0a622)

Change-Id: Ib283b1620947151338f5f9473891a048a17d8f4a
 2016-08-18 16:17:48 +01:00
Narayan Kamath
156720056b Process: Fix communication with zygote. am: 448be0a622 
am: 6bc7670c67

Change-Id: I37ea2a3324277340fce69fcc6a5101bee0637dca
 2016-08-18 10:25:53 +00:00
Narayan Kamath
b9871c0dd3 Process: Fix communication with zygote. am: 448be0a622 
am: ac16712d8a

Change-Id: Ief10a90dc77fa8e5cd562a39a6ddbad059353fdf
 2016-08-18 10:25:51 +00:00
Narayan Kamath
6bc7670c67 Process: Fix communication with zygote. 
am: 448be0a622

Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
 2016-08-18 10:19:58 +00:00
Narayan Kamath
ac16712d8a Process: Fix communication with zygote. 
am: 448be0a622

Change-Id: I5d496613f53c339c75a3293845670d9d8360c90f
 2016-08-18 10:19:57 +00:00
Andre Lago
3fa139c7b2 [media] Separate ringtones for managed profiles 
Separate the default system ringtone settings for managed profiles,
which previously used the same default ringtones as the personal profile
they belong to

Bug: 30658854
Change-Id: I22c69c7b8d31c7c424f5e00a3d9febac98b93d74
 2016-08-18 09:58:26 +01:00
TreeHugger Robot
df6183299b Merge "Remove permission review build property - framework" 2016-08-18 00:56:38 +00:00
Yohei Yukawa
64ea28e4f0 Make View#isTemporarilyDetached() less confusing am: ed841cbdd7 am: 6bc17c7320 
am: 8c8477d036

Change-Id: I5a4a16d4a1922a71def989b3bdf44810d6334100
 2016-08-18 00:23:39 +00:00
Jorim Jaggi
6fb0e52b85 Fix a flicker when returning to the lockscreen am: d11d1a9486 am: afaf4ac7a9 
am: 9322632f6a

Change-Id: I9cd7ead4caa2843e3063d55ea357e9e989c72f0e
 2016-08-18 00:17:02 +00:00
Jim Miller
7329e02153 Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e am: cb83f6188b 
am: e3457fc127

Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332
 2016-08-17 23:31:06 +00:00
Jim Miller
e3457fc127 Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e 
am: cb83f6188b

Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
 2016-08-17 23:22:33 +00:00
Jim Miller
cb83f6188b Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c 
am: 229de7088e

Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
 2016-08-17 23:15:43 +00:00
Jim Miller
229de7088e Fix vulnerability in LockSettings service am: 2d71384a13 
am: 485fbda04c

Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
 2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c Fix vulnerability in LockSettings service 
am: 2d71384a13

Change-Id: I62ca5fb150022fe0971329294b1063957f397248
 2016-08-17 22:59:27 +00:00
Svet Ganov
77df6f315d Remove permission review build property - framework 
Change-Id: Ifcfd436f2d57a6006ef804292d2875434e4669da
 2016-08-17 14:52:26 -07:00
Chong Zhang
921f8e35d8 resolve merge conflicts of 9391bc5 to master 
Change-Id: I6de231781233826b399688dc8ead70ba515b1ccb
 2016-08-17 14:38:12 -07:00