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

63140 Commits

Author SHA1 Message Date
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
Andreas Huber
8dcbf8ba43 Merge "Support one-way methods in java support for hardware binder." 2016-08-19 15:53:13 +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
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
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
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
Yohei Yukawa
8c8477d036 Make View#isTemporarilyDetached() less confusing am: ed841cbdd7 
am: 6bc17c7320

Change-Id: Iec61193cd1d1902aa9aad1ad9ac1d6f4944c748b
 2016-08-17 19:55:47 +00:00
Yohei Yukawa
6bc17c7320 Make View#isTemporarilyDetached() less confusing 
am: ed841cbdd7

Change-Id: I2df97c1babb9fc515295c527a18d9f88546dfad7
 2016-08-17 19:49:01 +00:00
John Reck
5ab0541052 Fix maps resume being blank am: 03df0834e6 am: 08669fff33 
am: 28f4ee5f7b

Change-Id: I5d6ea69cb13a43401a6cdc7039eafc1186a2fa85
 2016-08-17 18:28:51 +00:00
Chong Zhang
9391bc557c Add new window type TYPE_DRAWN_APPLICATION am: fea963edee 
am: 5e09ceb641

Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
 2016-08-17 18:22:10 +00:00
John Reck
28f4ee5f7b Fix maps resume being blank am: 03df0834e6 
am: 08669fff33

Change-Id: If87b076b6c03b7018485ddd4438aeaac7abd1562
 2016-08-17 18:04:21 +00:00
Chong Zhang
5e09ceb641 Add new window type TYPE_DRAWN_APPLICATION 
am: fea963edee

Change-Id: If7acf1349b87d4be88a9b4f9fbd984bbd4aca8ad
 2016-08-17 17:16:18 +00:00
Etan Cohen
fb5b680514 Merge "Support timeouts for requestNetwork() invocations." 2016-08-17 17:15:46 +00:00
John Reck
08669fff33 Fix maps resume being blank 
am: 03df0834e6

Change-Id: Iad93e1b11e74acf2356d59c271892d6741b53fef
 2016-08-17 17:14:23 +00:00
TreeHugger Robot
70528f5b6c Merge "VPN network stat accounting changes." 2016-08-17 00:19:10 +00:00
Jeremy Joslin
8b436d865c VPN network stat accounting changes. 
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
 2016-08-16 15:53:57 -07:00
TreeHugger Robot
7d3d7ae556 Merge "Updating the javadoc of DevicePolicyManager#wipeData" 2016-08-16 21:47:37 +00:00
George Mount
3289bfa289 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
 2016-08-16 13:10:19 -07:00
John Reck
03df0834e6 Fix maps resume being blank 
Bug: 30889568

Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.

Change-Id: Ib75065d3d75e6141d6cd8f306584f6a569b9907c
 2016-08-16 09:44:23 -07:00
Robert Carr
9d9ee4e5a3 Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f am: 5f684d92b6 
am: bdbc23bebe

Change-Id: I6a9b2a55148a1c2428e871337bb300a84887adc7
 2016-08-16 01:54:11 +00:00
Robert Carr
bdbc23bebe Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f 
am: 5f684d92b6

Change-Id: Idf2bb8511e24732018ff59ffbf30f440cb7f9779
 2016-08-16 01:44:07 +00:00
Robert Carr
5f684d92b6 Introduce new constant for double tap gesture rotation hint. 
am: 57d9fbd17f

Change-Id: I994c15c692ec52160deb3d29b46396802562588a
 2016-08-16 01:35:59 +00:00
TreeHugger Robot
b14543d9d8 Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev 2016-08-16 01:21:57 +00:00
Chong Zhang
fea963edee Add new window type TYPE_DRAWN_APPLICATION 
This type behaves like a normal TYPE_APPLICATION, except that WM
will always wait for it to be drawn before starting a transition.

WM always waits for TYPE_BASE_APPLICATION (main window), but for
TYPE_APPLICATION, it only waits if the window relayouts to visible
and gets a surface before the main window is drawn. If main window
itself is ready very fast, transition could start without the other
window.

bug: 30830849
Change-Id: Ife71a9812db7c8eba6ee4ead10ce4f31d9e93b40
 2016-08-15 17:36:40 -07:00
Dianne Hackborn
c7dc4add63 Docs only: N is no longer a shrug. am: c1b607df71 am: 6fe27966e2 
am: dbe43ee9ba

Change-Id: I8ba0795a2d4e25ede3654b9ab4dd95c5bed74ee1
 2016-08-15 22:37:29 +00:00
Andreas Huber
2d28047166 Merge "Initial commit of Java support for hardware binder." 2016-08-15 21:36:43 +00:00
Dianne Hackborn
dbe43ee9ba Docs only: N is no longer a shrug. am: c1b607df71 
am: 6fe27966e2

Change-Id: I0d441487fae3e95741f83ab92042bca7547006ae
 2016-08-15 21:35:48 +00:00
Dianne Hackborn
6fe27966e2 Docs only: N is no longer a shrug. 
am: c1b607df71

Change-Id: Iaf3a4c23ec9c94dccfa6db15e6caf90a74a5f3c0
 2016-08-15 21:25:41 +00:00
Dianne Hackborn
6af2db3824 Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev 2016-08-15 21:16:43 +00:00
Robert Carr
57d9fbd17f Introduce new constant for double tap gesture rotation hint. 
As discussed in ag/1192965/ we have a special case for rotation
animation selection in launch from double tap. This was set to
ROTATION_ANIMATION_CROSSFADE as the goal was just to avoid
ROTATION_ANIMATION_ROTATE on the viewfinder surface and
seamless rotation in launch scenarios was initially descoped. Now we
are aiming at fixing this though, and ROTATION_ANIMATION_CROSSFADE
does not quality for seamless rotation. ROTATION_ANIMATION_JUMPCUT
also would not be a good choice because in the situation that the
rotation occurs before the app starting window appears, then we would
jump cut from unrotated wallpaper to rotated app, I think we want
a crossfade in this scenario. To this end introduce and use a new @hide constant
ROTATION_ANIMATION_SEAMLESS which qualifies for seamless but falls back
to CROSSFADE if seamless can't occur.

Bug: 30171992
Change-Id: If1945b17b5159be4cd5ba0b139d6bea9f7fcca33
 2016-08-15 12:25:37 -07:00
Erik Kline
57faba9ec7 Support timeouts for requestNetwork() invocations. 
(cherry-pick of 06c3ef1367)

Bug: 21414325
Change-Id: I08118be8e8cf92fc406d431e99a6c9191a863ff3
 2016-08-15 10:19:45 -07:00
Todd Kennedy
53f7d933be Merge "More settings cleanup" 2016-08-15 17:17:51 +00:00
Andreas Huber
c0b6c53076 Initial commit of Java support for hardware binder. 
Squashed commit of the following:

    commit a536e55110a62871662d2f0b1771d7b66bb3cb27
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Aug 15 09:04:45 2016 -0700

    start HwBinder thread pool upon service registration

    Change-Id: I8e91d20e29a5647a36aad083c23d1b594fdc68c5

    commit 0a1882999e0021b68ccebb0306905f17962b8a70
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Aug 11 15:41:05 2016 -0700

    IHwInterface, queryLocalInterface.

    also moved looking up a service into HwBinder. HwRemoteBinder is now an
    implementation detail.

    Change-Id: Ic0b818f5b36c42c608e570fe41a2c0272a6e48df

    commit d99b0b065bde6e0f071245719f8ab31ad25d91be
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Aug 8 09:07:51 2016 -0700

    work in progress

    Change-Id: I4f5612944e9ac1c762ad1fa2e238836e37b484da

    commit 64f027e55780284b981f88a1605c00a0a0f091f4
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Aug 4 10:10:52 2016 -0700

    Squashed commit of the following:

    commit d023d5570ef810094a3d4382158f32faff46c480
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Aug 4 10:09:41 2016 -0700

    Some more cleanup, file organization more closely matches existing code in

    frameworks/base/core/jni/..., don't produce a separate shared library, this is
    now linked as part of libandroid_runtime.so

    Change-Id: I91024f137ff0faae26e72aa9a7163b80b97f0d05

    commit 7cf5370748a9a99be68fac0f32c6793f5bfc4a15
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Aug 4 09:37:44 2016 -0700

    Some more cleanup.

    Change-Id: Ibb89280f51234f8a3dd29ca6d57d6eaaf80a03ea

    commit d70638398ed47c29401d6118e03d640245ecc9b2
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Aug 4 09:31:49 2016 -0700

    hidl::{Parcel,Binder & friends} => hardware::\1

    Change-Id: I8f37a260d4a9afe66e02f7266c54af093502869f

    commit 0fc680aea7753d8de91b4a3806b892dcb4fface8
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Aug 1 14:55:17 2016 -0700

    Squashed commit of the following:

    commit daa714921e20bc209bd7c05aea458569ce539993
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Aug 1 12:09:27 2016 -0700

    Switch to NativeAllocationRegistry for pairing java- with native objects.

    Change-Id: I011fda51e8c24d9e03d6a0ddbcdac9196dc8ab72

    commit 3a02606dba870f8313e1db919720647f686273b4
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Jul 28 11:44:26 2016 -0700

    Squashed commit of the following:

    commit e77b8ff331ed1b5554b4c7c1cd99ed99dbed5f45
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Jul 28 11:15:12 2016 -0700

    no more LOCAL_C_INCLUDES, read/writeEmbeddedBuffer APIs changed to take

    a size_t instead of a uint64_t for both handles and offsets.
    Use android-base/logging instead of utils/Log.h for logs/assertions.

    Change-Id: I1129c75da46e4335efbf94a3394f9bde7d0ad0c6

    commit fbc3a7be0a8cde86b334a677a0e127123beb0051
    Author: Andreas Huber <andih@google.com>
    Date:   Wed Jul 27 16:20:24 2016 -0700

    Squashed commit of the following:

    commit bda9396472eaa32c7643927017ccfdcba8a6aeb3
    Author: Andreas Huber <andih@google.com>
    Date:   Wed Jul 27 16:19:57 2016 -0700

    Code review in progress.

    Change-Id: I66cc3a4ec8caf6feac0d526130c0c3902fd8e2cc

    commit 2887d9589562c3e9834e5d6bb513ab5eff9cdb5f
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 25 12:00:38 2016 -0700

    Squashed commit of the following:

    commit 8a565b0282577508db00a9f6146e75d962b854f4
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 25 12:00:13 2016 -0700

    @hide everything

    Change-Id: I54411d1b0d9cd2ddb66acc1444c23b17b98e58a6

    commit e55a1dd871a2c653bca300335ba9dcc78b3c5ea5
    Author: Andreas Huber <andih@google.com>
    Date:   Tue Jul 19 11:19:07 2016 -0700

    Squashed commit of the following:

    commit c9ae58af694ae2c8451486fe83fab0f6e1398047
    Author: Andreas Huber <andih@google.com>
    Date:   Tue Jul 19 10:10:56 2016 -0700

    switch to a better way of finishing/sending stub transactions

    Change-Id: I7e237f57f4dbd69d05caeb62de0876c40feaa1cf

    commit 0af00b5c41bf808f31300a565467d463d8df0636
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 18 15:32:09 2016 -0700

    exceptions >> assertions

    Change-Id: I098d6e170525539b81aae5e8890c8460ec78df18

    commit f5e1363c2e6b7713ae1460cd8dc22872deebedc4
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 18 11:57:04 2016 -0700

    Squashed commit of the following:

    commit b8716cdf75ac1785f6decb6d236d689c087889cd
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 18 11:56:35 2016 -0700

    Support for {read,write}StringVector.

    Change-Id: I816e4fc22afde960a481c0fb4c3d8531bffa6e56

    commit 34279699169c9ba5fdc03055a863432a2edd1901
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 18 10:08:32 2016 -0700

    LEGO -> Hw

    Change-Id: Ib63ef44cfd13e5a2c3a358d055aad162163d8600

    commit eb2b09c4a03ba785363a8b230a89718ef319c35b
    Author: Andreas Huber <andih@google.com>
    Date:   Fri Jul 15 14:01:11 2016 -0700

    Squashed commit of the following:

    commit c657839a54cf6054e1983a59a59bfcc0854cc952
    Author: Andreas Huber <andih@google.com>
    Date:   Fri Jul 15 12:55:04 2016 -0700

    Support for {read,write}StringArray and stubs for {read,write}StringVector

    Also refactored existing code to take advantage of HidlSupport.h

    Change-Id: I55613d0c66706008d1f96576b9f7a500d52b2cd3

    commit 5d29cd53c4f2a9fe0cdc9052e4041c92d0873042
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Jul 14 16:38:09 2016 -0700

    Squashed commit of the following:

    commit 0a7e49f20d18a7eebda889594cc1bc5511ce2fdc
    Author: Andreas Huber <andih@google.com>
    Date:   Tue Jul 12 14:21:56 2016 -0700

    support all primitive array and vector read/write operations on LEGOParcel

    Change-Id: I200d1dccedc0fd752c297714e8e0df967fdb653b

    commit e0401c2fabc548681d7fd304c09b4ca8838bb0b5
    Author: Andreas Huber <andih@google.com>
    Date:   Tue Jul 12 09:53:42 2016 -0700

    Added LEGOParcel.{read,write}{Int8,Int16}

    Change-Id: I0d9cc149802837593db606692694dbce1b12e521

    commit 9187f7a349c0861549df2c534803e03066d22b4a
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 11 16:10:50 2016 -0700

    Better handling of temporary storage in JLEGOParcel

    Change-Id: I31cdf7b6f1f4bd486661288346cf530c9e92beaa

    commit dc2e5f6f0bb737c739e1dab356efeac945c000c3
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 11 14:18:09 2016 -0700

    proper (read/writeBuffer based) marshalling of strings and int32 arrays

    Change-Id: I2fadd2f831cc0acb50a41222525e71f29b57e79e

    commit 6463a03074fa514ea8b7cb61e475c246e6136b43
    Author: Andreas Huber <andih@google.com>
    Date:   Mon Jul 11 13:13:31 2016 -0700

    support for ILEGOBinder marshalling

    Change-Id: I8ceea45dfcb8460e59a05999ccdcad319650dede

    commit 8c26a006ded339043677d3607884da0abb3e742d
    Author: Andreas Huber <andih@google.com>
    Date:   Fri Jul 8 16:42:38 2016 -0700

    A quick and dirty fix for the

    "storage must stay around until transact() returns" issue.

    Change-Id: I75ac09391cdc23dcc6e154b32eff945f29d00cc0

    commit df7d2c1e4e33d6554ab16e33c90bdf30ce2a136d
    Author: Andreas Huber <andih@google.com>
    Date:   Fri Jul 8 08:48:31 2016 -0700

    Squashed commit of the following:

    commit c42764acbaefab5ffc829dd1a3b60aa252643ae6
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Jul 7 16:51:10 2016 -0700

    An attempt at LEGOParcel.{read,write}Int32Vector

    Change-Id: I9dc54828ad10c8cec8ca292db011925cd60893e2

    commit faa502ac98d28f3eff10a4c16443059ca316c76b
    Author: Andreas Huber <andih@google.com>
    Date:   Thu Jul 7 14:58:24 2016 -0700

    Support for LEGOParcel.{read,write}{String,Int32Array}

    Change-Id: I38317f22ff977bed2f8203c24333bbb7de6f1cc5

    commit ba048b13eb014472130094fafd0fe982363d7add
    Author: Andreas Huber <andih@google.com>
    Date:   Wed Jul 6 16:41:14 2016 -0700

    LEGO{Binder,Parcel,RemoteBinder} java classes

Change-Id: If1098ab921a11bae8eca2a70a3c3070e4daa0ea2
 2016-08-15 09:28:30 -07:00
Andrei Stingaceanu
d055939c7c Merge "TextView - fix ClickableSpans always triggering on touch up" 2016-08-15 15:16:26 +00:00
Andre Lago
ea35e07e1b [Settings] Added setting SYNC_PARENT_SOUNDS 
Added a setting that specifies wether a managed profile's ringtones
should be the same as its parent

Change-Id: I90e20cee111640404c3758030f41d5b2b5af1c28
 2016-08-15 10:08:04 +01:00
Hui Shu
1fa574c3c5 Fix documentation. am: bd042e666a am: 440d84f99a 
am: 68cee7e245

Change-Id: I33cc61c64c85a8b0bee7338feb55d5551cc2fd26
 2016-08-14 00:41:33 +00:00
Adrian Roos
1fafcc6f64 Assist: Allow disabling the disclosure animation am: 2335bd6787 am: 57d1601849 
am: ae96089711

Change-Id: I3d086e48a7ea312ae972495a157f18b62bc36e13
 2016-08-14 00:34:13 +00:00
Colin Cross
2c5439972f resolve merge conflicts of f95418e to master 
Change-Id: If2b4d34b3ba64f61214b72fd71f8767500e68a53
 2016-08-13 11:20:37 -07:00
Dianne Hackborn
c1b607df71 Docs only: N is no longer a shrug. 
Change-Id: I6fa8f77d93f53b7969ec6aab4c7e9ca27d17d01f
 2016-08-12 17:01:35 -07:00
TreeHugger Robot
2eafc97b32 Merge "Allow calls to TimedRemoteCaller in parallel." 2016-08-12 23:36:44 +00:00
Hui Shu
68cee7e245 Fix documentation. am: bd042e666a 
am: 440d84f99a

Change-Id: I1d0c75c6692557e1d66ca66036bceda6ca62c702
 2016-08-12 23:19:41 +00:00
Adrian Roos
ae96089711 Assist: Allow disabling the disclosure animation am: 2335bd6787 
am: 57d1601849

Change-Id: I5954913f4f210e47d5e3a297f25d3f646cdd2a4b
 2016-08-12 23:16:53 +00:00
Hui Shu
440d84f99a Fix documentation. 
am: bd042e666a

Change-Id: Ib749bd51c24a2012cd2b0d87ed70c034f410bc58
 2016-08-12 21:29:47 +00:00
Hui Shu
caef4afe42 Merge "Fix documentation." into nyc-mr1-dev 2016-08-12 21:24:44 +00:00