Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,308 Commits 3 Branches 0 Tags
498f780f42d39906ef634abada86eb750ce24fbb
Commit Graph

250308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
498f780f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 31cd8615b2  -s ours

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

Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
 2016-06-03 17:12:42 +00:00
Bill Yi
7d627e9cf0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 52edfafb9c  -s ours

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

Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
 2016-06-03 17:12:38 +00:00
Bill Yi
c29b39b95f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f79616b427  -s ours

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

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
 2016-06-03 17:12:33 +00:00
Bill Yi
5c2575071e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a68d1f10e2  -s ours

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

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

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

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

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

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

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

Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
 2016-06-03 17:03:59 +00:00
Bill Yi
479f70c516 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cace07e727  -s ours

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

Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
 2016-06-03 17:03:50 +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
Adrian Roos
50844bc504 Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
 2016-06-03 15:53:09 +00:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Julia Reynolds
08cc30378c Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
 2016-06-03 13:33:11 +00: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
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN 
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
 2016-06-03 10:43:37 +00: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
Eric Schmidt
637ccf7585 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d 
am: 9ad88ce3fe

* commit '9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
  docs: Fixed background optmizations code snippet

Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
 2016-06-03 03:06:49 +00: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
8aadde745f Merge "Fix task selection logic" into nyc-dev 
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
 2016-06-03 02:07:11 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Pavlin Radoslavov
c9e93d4294 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
 2016-06-03 01:00:34 +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
701cd3fe15 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 
am: b68601d247

* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
 2016-06-02 23:15:57 +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
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev 
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
 2016-06-02 22:43:41 +00:00
Philip P. Moltmann
bf0f82bd69 Merge "Do not rotate PDFPrinter pages." into nyc-dev 
am: 5d6a4f582e

* commit '5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
  Do not rotate PDFPrinter pages.

Change-Id: I1f24415c1f7245f5bee5fb24f7d642c0e22a3bdd
 2016-06-02 22:37:22 +00:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00
TreeHugger Robot
5d6a4f582e Merge "Do not rotate PDFPrinter pages." into nyc-dev 2016-06-02 22:30:24 +00:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor 
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
 2016-06-02 15:25:15 -07:00
Jorim Jaggi
a80c867adf Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 
am: 6321f42fbe

* commit '6321f42fbee425745de9636d45e4973fa6c470b9':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: I8cb3702db22d24de2aa64360e8e22577f320d00d
 2016-06-02 22:19:12 +00:00
Billy Lamberta
3050400767 docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed 
am: a092b6cdb9

* commit 'a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
  docs: work minisite post-launch fixes

Change-Id: I39f4ea830be553013e8c9ce7989581b31fcbd994
 2016-06-02 22:10:08 +00:00
TreeHugger Robot
6321f42fbe Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev 2016-06-02 22:08:15 +00:00
Billy Lamberta
a092b6cdb9 docs: work minisite post-launch fixes am: 9fec73a47c 
am: 84903c24ed

* commit '84903c24ed74c75a2217648a96931cc3045143ea':
  docs: work minisite post-launch fixes

Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
 2016-06-02 22:04:13 +00:00
Billy Lamberta
84903c24ed docs: work minisite post-launch fixes 
am: 9fec73a47c

* commit '9fec73a47c158df0a184a1f2a0301b6394cfec40':
  docs: work minisite post-launch fixes

Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
 2016-06-02 21:59:29 +00:00