Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,461 Commits 3 Branches 0 Tags
d2cf835880f2207e2df090599130f32ccb73f23d
Commit Graph

246461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
d2cf835880 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev 
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d
 2016-06-06 10:30:42 +00:00
Robin Lee
265f4113ee Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev 2016-06-06 10:10:56 +00:00
Dianne Hackborn
13c2764cef Fix issue #29006049: Add logging for implicit broadcasts 
am: bc02a3901d

* commit 'bc02a3901dea52d236dd855722191155156cb856':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: Ifd88a4ce68bd9c2853d085bb10f74df682ae8ee6
 2016-06-05 18:17:01 +00:00
Dianne Hackborn
bc02a3901d Fix issue #29006049: Add logging for implicit broadcasts 
We now have stats on broadcasts.  We collect them over a day and
then reset, retaining the last days stats.  When a checkin happens,
we return either the last day or the current stats and then clear
them.  Not bothing to persist anything to storage, this data is
not that critical.

Change-Id: I1c3b331bcd03f79fa5e10575d9bc2ad7d9104f6f
 2016-06-04 23:40:12 -07:00
Chen Xu
ba3428f01b Merge "cold sim clean up" into nyc-mr1-dev 2016-06-04 05:48:47 +00:00
Jorim Jaggi
72a6f058cf Fix delayed light status bar animation 
Make sure to do another layout when we show the dim layer so PWM
can pick up the change and send it to SysUI.

Bug: 28434629
Change-Id: I877669ede8534601933043f60c8cef8502918c7b
 2016-06-04 01:17:31 +00:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info 
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
 2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
James Hawkins
440e3c7dfe Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev 
am: eb47d6205f

* commit 'eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I487eaa279cc0054675c722d1c91b82598b4dd45d
 2016-06-03 22:20:14 +00:00
Selim Cinek
6efad815c2 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev 
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354
 2016-06-03 22:18:16 +00:00
Fyodor Kupolov
de5521d049 Merge "Delete account from DE and CE databases" into nyc-dev 
am: a087d7f4fa

* commit 'a087d7f4fa6de262aef346acb336fcb826d05d23':
  Delete account from DE and CE databases

Change-Id: Id21fda0bca3c257f5ba8e68fb09a6de47f8f3374
 2016-06-03 22:18:15 +00:00
Billy Lamberta
ce13039f1d Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev 
am: c0b602c441

* commit 'c0b602c441337f9597959a02262de525b1793a94':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I18a126393bb04d0325946a980f247edd2f3788ad
 2016-06-03 22:18:13 +00:00
Andrew Solovay
37286f7092 Merge "docs: Update N release notes for DP4" into nyc-dev 
am: e20c1e96fc

* commit 'e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
  docs: Update N release notes for DP4

Change-Id: Iee292ba0b9f1f1eae2dcaadf58a06b75e4d5c8f3
 2016-06-03 22:18:11 +00:00
Todd Kennedy
b724b68812 Merge "New prebuilt" into nyc-dev 
am: 93b34141b1

* commit '93b34141b1de89a8f176884c3ceb7bc968b252d0':
  New prebuilt

Change-Id: I4a9041473718ae00499dcccb2ccf98204ccfb80a
 2016-06-03 22:17:58 +00:00
TreeHugger Robot
eb47d6205f Merge "am/UserController: Log system uptime at two 'boot complete' markers." into nyc-dev 2016-06-03 22:01:05 +00:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant. 
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
 2016-06-03 14:08:06 -07:00
Selim Cinek
6c94972622 Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev 2016-06-03 20:39:25 +00:00
Jeff Sharkey
9351225839 Fix build after merge. 
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
 2016-06-03 14:34:16 -06:00
TreeHugger Robot
a087d7f4fa Merge "Delete account from DE and CE databases" into nyc-dev 2016-06-03 20:00:27 +00:00
Jeff Sharkey
f5b0bf3563 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9 
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
 2016-06-03 13:53:48 -06:00
TreeHugger Robot
8ad820ef54 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 19:25:21 +00:00
Android Build Merger (Role)
c0b602c441 Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev 2016-06-03 18:57:25 +00:00
Billy Lamberta
73e0557ecd docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 
am: 90ee70e519

* commit '90ee70e51927a1cd764bb523f419252547739803':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I19728a3809efb6c3341fa75678625ad0d617d4d5
 2016-06-03 18:56:53 +00:00
TreeHugger Robot
e20c1e96fc Merge "docs: Update N release notes for DP4" into nyc-dev 2016-06-03 18:48:57 +00:00
fionaxu
1bf6ec2f86 cold sim clean up 
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
 2016-06-03 11:45:12 -07:00
Billy Lamberta
90ee70e519 docs: Fix code sample in /work: Set up Single-Purpose Devices 
am: f4973c28a5

* commit 'f4973c28a513b117bed6f3b7f5e2ffbd975d4f02':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I2e2f851ddf9208d3a734913369e8ece1fe199cfe
 2016-06-03 18:32:42 +00:00
TreeHugger Robot
2e032b7463 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 18:10:17 +00:00
Billy Lamberta
f4973c28a5 docs: Fix code sample in /work: Set up Single-Purpose Devices 
bug: 29095115
Change-Id: I7af38925ce24124d0b48368d9a0436b2d60995b5
 2016-06-03 11:08:23 -07:00
Wang Xiaolei
93b34141b1 Merge "New prebuilt" into nyc-dev 2016-06-03 18:08:21 +00:00
Wang Xiaolei
44b24c9b38 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 2016-06-03 18:08:21 +00:00
Fyodor Kupolov
627fc2021d Delete account from DE and CE databases 
When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.

Bug: 28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58
 2016-06-03 11:03:03 -07:00
Bill Yi
27bdfbf794 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: I52252de40753f1e8b6bc38f738f5385bd1168f73
 2016-06-03 18:02:46 +00:00
Bill Yi
373ad6f5a1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: If8c66d039bb6cb91fad5011c0f63ca309a80af15
 2016-06-03 18:02:42 +00:00
Eino-Ville Talvala
02c43050af Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285
 2016-06-03 18:01:57 +00:00
TreeHugger Robot
10e29e0730 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:54:21 +00:00
TreeHugger Robot
93bc210b3f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:53:28 +00:00
Eino-Ville Talvala
cd44a32dfe Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 2016-06-03 17:51:19 +00:00
Todd Kennedy
51e458ebd0 New prebuilt 
Need to target API 24 and not 'N'. Also made a small change to the docs

Bug: 29116156
Change-Id: I21c37aa04a4471ca6b3f7727e470129a78f92cf0
 2016-06-03 10:16:12 -07:00
Sudheer Shanka
2a098206c4 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 
am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I223aed76ae1be41cb97582c0fd02d3c4177e59e5
 2016-06-03 17:14:37 +00:00
Bill Yi
1bef62e488 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 237b52f40c  -s ours

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I07c0367ff58a8d2852c00b204d72fd7334341dc3
 2016-06-03 17:14:23 +00:00
Bill Yi
85e1b30a61 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: Ie488bbdd015ab61b80505a10a03d1cf99e1b838e
 2016-06-03 17:14:20 +00:00
Bill Yi
d5d030af8b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 52edfafb9c  -s ours

* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
  Import translations. DO NOT MERGE

Change-Id: Id8f46d8473ac5b77cc8fcd4c09a74b623cc3b91f
 2016-06-03 17:14:18 +00:00
Bill Yi
88fdea080f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f79616b427  -s ours

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: I35c307deac6f9b0fc01102841cd567a0ec2e4b6f
 2016-06-03 17:14:15 +00:00
Bill Yi
abd7b12ada Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a68d1f10e2  -s ours

* commit 'a68d1f10e2c20e128215406b4d6f4fb835481324':
  Import translations. DO NOT MERGE

Change-Id: I99d55bcb79d0e4e066eb558f887688ea7742eb36
 2016-06-03 17:04:14 +00:00
Bill Yi
a547d62f78 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2130b28754  -s ours

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ieac6c674226e01153395c9cba948b29fc1ba3409
 2016-06-03 17:04:11 +00:00
Bill Yi
5346695e1d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ef2989920d  -s ours

* commit 'ef2989920d00f19d5dcd86bd521eec86bc058754':
  Import translations. DO NOT MERGE

Change-Id: I338b7cbfe30f05cceda36cc0cc0a756bcd80ecfc
 2016-06-03 17:04:09 +00:00
Bill Yi
a1ba60ce29 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3d9d9fa0d9  -s ours

* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
  Import translations. DO NOT MERGE

Change-Id: Ib91f10802f60fc4f7ee9cbe6f1d3df11b46ad37e
 2016-06-03 17:04:05 +00:00
Bill Yi
337c1b1108 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cace07e727  -s ours

* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
  Import translations. DO NOT MERGE

Change-Id: Ib82f00c78c2e08d1d79430198f7cb505f2b2e334
 2016-06-03 17:04:02 +00:00
TreeHugger Robot
5548733eb5 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 2016-06-03 17:02:53 +00:00