Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
4ae6354467 Import translations. DO NOT MERGE 
Change-Id: I53789d03049f5647fff50cf5521b461bf5481afd
Auto-generated-cl: translation import
 2016-06-03 04:57: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
69e29c77b8 Import translations. DO NOT MERGE 
Change-Id: Ibee7d58074781c85c28496af8ad0702b51fd85a8
Auto-generated-cl: translation import
 2016-06-03 04:50:16 -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
0fbac210a7 Import translations. DO NOT MERGE 
Change-Id: I5ad391c3e1b05ca8363ffca2837860946cd4570f
Auto-generated-cl: translation import
 2016-06-03 04:31:48 -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
3be3f6cc5e Import translations. DO NOT MERGE 
Change-Id: I1af602c8252ce1006e26a8f965fe56e976fe3439
Auto-generated-cl: translation import
 2016-06-03 04:11:55 -07:00
Tony Mak
4b63e1d9d3 Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp 
am: 9c13d78862

* commit '9c13d78862ff07b2f7664d578c6fa5b28c2e6d58':

Change-Id: Ife7cda0e14804f8974a5142e423b7b85bade196e
 2016-06-03 11:07:41 +00:00
Tony Mak
7cf85ffc58 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: fff6650de4 
am: aefec202de

* commit 'aefec202de2a94ce2a624d72bd2036f7141b1af7':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I88bba620c3a3212ebf74ee0f884febc3ec923c1f
 2016-06-03 11:07:38 +00: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
dd92cc5dbe Import translations. DO NOT MERGE 
Change-Id: Ia658676186e563e8e1e83c273fd76c011b9169ef
Auto-generated-cl: translation import
 2016-06-03 03:57:53 -07:00
Android Build Merger (Role)
9c13d78862 Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp 2016-06-03 10:55:28 +00:00
Tony Mak
e34c4f77d1 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 
am: d73c6eb6f3

* commit 'd73c6eb6f3b7fa9ac7729e1e870b4285d42b9b44':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ia07e1d86214ca226aa0802c2ab6f6628da631937
 2016-06-03 10:54:56 +00:00
Tony Mak
aefec202de OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 
am: fff6650de4

* commit 'fff6650de4ac847db61ffdf3fbc82a39e3878313':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
 2016-06-03 10:54:46 +00:00
Bill Yi
f794288a3e Import translations. DO NOT MERGE 
Change-Id: I1e9706b340786d79d7a9cdc4735137d3fcf2e840
Auto-generated-cl: translation import
 2016-06-03 03:51:12 -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
Tony Mak
d73c6eb6f3 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: I2de02ec6febdc58ff9a79562059cc11e7d617be5
 2016-06-03 10:43:30 +00:00
Bill Yi
da085a46a0 Import translations. DO NOT MERGE 
Change-Id: Ib9d08e1380ee7258fc8a760cf82a10862b35ac84
Auto-generated-cl: translation import
 2016-06-03 03:43:29 -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
Bill Yi
a5c543bf35 Import translations. DO NOT MERGE 
Change-Id: Iec10d485540939eca94ecf3d013cb7a9cda8c4f2
Auto-generated-cl: translation import
 2016-06-03 03:36:04 -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
8216d44ce2 Merge "Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d am: 9ad88ce3fe am: 46a51cb108" into nyc-mr1-dev-plus-aosp 
am: e667dece62

* commit 'e667dece627cd80b17362b93fa553fe36af096d9':

Change-Id: Ia964931435e7f88bd53dc347030e6141380f3298
 2016-06-03 03:22:54 +00:00
Eric Schmidt
68a78940b1 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d am: 9ad88ce3fe am: 637ccf7585 
am: eb18b3603c

* commit 'eb18b3603ce4699fa91d7c0752c6e846b19f3436':
  docs: Fixed background optmizations code snippet

Change-Id: I458721dc5ecf92d49a8796014dc565c3fb992758
 2016-06-03 03:22:49 +00:00
Android Build Merger (Role)
e667dece62 Merge "Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d am: 9ad88ce3fe am: 46a51cb108" into nyc-mr1-dev-plus-aosp 2016-06-03 03:14:43 +00:00
Eric Schmidt
d53e6d4aa6 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d am: 9ad88ce3fe 
am: 46a51cb108

* commit '46a51cb10804374700647399635db0ffb1bfcfbe':
  docs: Fixed background optmizations code snippet

Change-Id: I95eaace44c1b0385f5d97ef3ddf726ae346551a0
 2016-06-03 03:14:18 +00:00
Eric Schmidt
eb18b3603c Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d am: 9ad88ce3fe 
am: 637ccf7585

* commit '637ccf758567e128b248078e2bd8e99f7663cda8':
  docs: Fixed background optmizations code snippet

Change-Id: Ib5bc0fb814758db2e2ad9352792085a9bc7fb74a
 2016-06-03 03:14:01 +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
46a51cb108 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: I1a68f03403c34993525487f604422367f35fc0a0
 2016-06-03 03:06:44 +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
TreeHugger Robot
b6d004f7a0 Merge "sysui: refactor for extensibility." 2016-06-03 02:31:37 +00:00
Andrii Kulian
ade1581d2c Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c am: 8aadde745f 
am: f85f761679

* commit 'f85f761679ed34609ea4c8a58e3728eb0ef3a212':

Change-Id: I1fda382c9322e1174ea2a35d098e64dc813b9f0e
 2016-06-03 02:22:44 +00:00
Andrii Kulian
7b30d79098 Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c am: f4b91fe3e1 
am: f17c14c657

* commit 'f17c14c657aeb796cc5bd2b7d8597b51c5f785dd':
  Fix task selection logic

Change-Id: Ifd1a62530754a33cbf3d39a28d5f23e5787e31ad
 2016-06-03 02:21:11 +00:00
Andrii Kulian
f85f761679 Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c 
am: 8aadde745f

* commit '8aadde745fdd245a9263d81666fcd3f5f042f0fc':

Change-Id: I09d516df9e22030d82c5e10594274b0ebe1644f2
 2016-06-03 02:15:57 +00:00
Zhijun He
5745f4ce55 Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105 
am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea
 2016-06-03 02:14:59 +00:00
Andrii Kulian
f17c14c657 Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c 
am: f4b91fe3e1

* commit 'f4b91fe3e18b98e575cf498a5fdbcd8ad9603ce1':
  Fix task selection logic

Change-Id: I4d665fad6c972bdb11a192256d21f5fb9a27c96a
 2016-06-03 02:10:04 +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
Zhijun He
f103fd540e Merge "Camera2: add deferred output config support" into nyc-mr1-dev 
am: e8526a0105

* commit 'e8526a01051fc2b8929870c8bff28f1d6b8b652c':
  Camera2: add deferred output config support

Change-Id: I5bfa1c90e4ab5910ccd3a8727b95200e4b4221ca
 2016-06-03 02:07:10 +00:00
Andrii Kulian
f4b91fe3e1 Merge "Fix task selection logic" into nyc-dev 
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
 2016-06-03 02:07:04 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Zhijun He
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +00:00
Pankaj Kanwar
78a2a8a38d Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: fa790104f2" into nyc-mr1-dev-plus-aosp 
am: a5c78204eb

* commit 'a5c78204ebd39bd21a304ce9989b174388440796':

Change-Id: I1305cf2026c6e46d7d87915a81da7cc5fbf46f8f
 2016-06-03 01:08:35 +00:00
Pavlin Radoslavov
f805cc9c9b Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: c9e93d4294 
am: 51a440fa83

* commit '51a440fa83b87f0f841f88221fc03670b09cb89b':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ie34d0601901a50bba1ce7b0f5d8b736ac09ae026
 2016-06-03 01:08:31 +00:00
Android Build Merger (Role)
a5c78204eb Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: fa790104f2" into nyc-mr1-dev-plus-aosp 2016-06-03 01:05:03 +00:00
Sanket Agarwal
2d0c96c908 While turning OFF do not honor ON requests. 
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
 2016-06-03 01:04:43 +00:00
Pankaj Kanwar
97c4ee30e5 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 
am: fa790104f2

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

Change-Id: I15c414be645c7aab9b2bd1262dd57b83ca8e652a
 2016-06-03 01:04:30 +00:00
Pankaj Kanwar
51a440fa83 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 
am: c9e93d4294

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

Change-Id: I604d7fe975e3d7917014df470c9c42ada7d2808a
 2016-06-03 01:04:27 +00:00