Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,443 Commits 3 Branches 0 Tags
265f4113ee42e89f324b087a81044a9f1dab457e
Commit Graph

244443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
a087d7f4fa Merge "Delete account from DE and CE databases" into nyc-dev 2016-06-03 20:00:27 +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
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
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
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
TreeHugger Robot
5548733eb5 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 2016-06-03 17:02:53 +00:00
TreeHugger Robot
237b52f40c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:00:23 +00:00
TreeHugger Robot
31cd8615b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:51 +00:00
TreeHugger Robot
52edfafb9c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:27 +00:00
TreeHugger Robot
f79616b427 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:57:50 +00:00
TreeHugger Robot
a68d1f10e2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:56:16 +00:00
TreeHugger Robot
2130b28754 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:58 +00:00
TreeHugger Robot
ef2989920d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:03 +00:00
TreeHugger Robot
3d9d9fa0d9 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:54:40 +00:00
TreeHugger Robot
cace07e727 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:53:13 +00:00
Bill Yi
686d0d7cf6 Import translations. DO NOT MERGE 
Change-Id: Ie630e761cacbec55840a3de9439aa36835a34b38
Auto-generated-cl: translation import
 2016-06-03 09:33:00 -07:00
Bill Yi
29e1099f93 Import translations. DO NOT MERGE 
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
 2016-06-03 09:16:16 -07:00
Victor Chang
b04a5eab84 Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on 
Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725
 2016-06-03 17:14:32 +01:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Sudheer Shanka
54cb63c182 Avoid triggering support dialog in non-current user. 
Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
 2016-06-03 08:26:04 -07:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00
Bill Yi
aff777e609 Import translations. DO NOT MERGE 
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
 2016-06-03 06:04:14 -07:00
Bill Yi
b67c06c31a Import translations. DO NOT MERGE 
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
 2016-06-03 05:23:35 -07:00
Bill Yi
2641c648f7 Import translations. DO NOT MERGE 
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
 2016-06-03 04:52:48 -07:00
Bill Yi
012e254040 Import translations. DO NOT MERGE 
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
 2016-06-03 04:38:00 -07:00
Bill Yi
ba14c03ddc Import translations. DO NOT MERGE 
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
 2016-06-03 04:27:06 -07:00
Bill Yi
566cac1be3 Import translations. DO NOT MERGE 
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
 2016-06-03 04:02:53 -07:00
Bill Yi
d5b0b73a51 Import translations. DO NOT MERGE 
Change-Id: Ifc14a8e231354fe8cbe65f22761236006de64ce5
Auto-generated-cl: translation import
 2016-06-03 03:46:06 -07:00
Bill Yi
1a519c545e Import translations. DO NOT MERGE 
Change-Id: Ic23e11859d0b00fba56d8a3c93afbf86d139bcb4
Auto-generated-cl: translation import
 2016-06-03 03:38:40 -07:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN 
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
 2016-06-03 10:06:06 +00:00
Bill Yi
40b69850c5 Import translations. DO NOT MERGE 
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
 2016-06-02 21:18:31 -07:00
Eric Schmidt
9ad88ce3fe Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 
am: 76297d719d

* commit '76297d719d5bbe2dcce65c357591c22b1a1d3293':
  docs: Fixed background optmizations code snippet

Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
 2016-06-03 02:59:57 +00:00
Eric Schmidt
76297d719d Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 
am: 0b8eb8c1e8

* commit '0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
  docs: Fixed background optmizations code snippet

Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
 2016-06-03 02:52:51 +00:00
Eric Schmidt
0b8eb8c1e8 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 2016-06-03 02:41:46 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Pankaj Kanwar
0bc61eb176 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 2016-06-03 00:55:50 +00:00
Sanket Padawe
b68601d247 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 2016-06-02 23:11:23 +00:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00