drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,707 Commits 1 Branch 0 Tags
Commit Graph

245707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1d545c4f83 Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs 2016-07-21 23:07:16 +00:00
Andrew Solovay
abea4b1dcd docs: Replacing curly apostrophes with straight ones 
Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.

Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9
 2016-07-21 13:50:23 -07:00
sreevanis
01f12a9e18 Merge \"docs: Fixed typo.\" into mnc-io-docs 
am: 71f742920d

Change-Id: Ia489afb465582c6600d35ffed5826816b4043746
 2016-07-21 20:32:55 +00:00
Sreevani Sreejith
71f742920d Merge "docs: Fixed typo." into mnc-io-docs 2016-07-21 20:24:51 +00:00
Billy Lamberta
9684f2cd2f docs: work - Managed configuration bundles 
am: ef57498142

Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7
 2016-07-20 22:15:57 +00:00
Billy Lamberta
ef57498142 docs: work - Managed configuration bundles 
Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.

bug: 26151150
bug: 29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e
 2016-07-20 15:03:44 -07:00
Amanda Kassay
83fb75ded3 Fix for b/30088807 Dashboard page repeating charts three times on mobile. 
Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html

Change-Id: Iff6820353ff6fb3ec678ddfe209b2200ab872812
 2016-07-20 18:12:37 +00:00
Paul Stewart
a71fe00594 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7 
am: a20314a28e

Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab
 2016-07-20 03:17:07 +00:00
Paul Stewart
47e801972c Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a 
am: 6b05e285cc

Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3
 2016-07-20 03:17:01 +00:00
Paul Stewart
d77404a0e5 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9 
am: cf3595400b  -s ours

Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9
 2016-07-20 03:16:50 +00:00
Paul Stewart
a20314a28e Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 
am: 2331eefef7

Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
 2016-07-20 01:35:14 +00:00
Paul Stewart
6b05e285cc Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 
am: 537535c14a

Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
 2016-07-20 01:35:10 +00:00
Paul Stewart
2331eefef7 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac 
am: a09b6ee165

Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
 2016-07-20 01:28:54 +00:00
Paul Stewart
537535c14a Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 
am: b3ff6b4437

Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
 2016-07-20 01:28:52 +00:00
Paul Stewart
cf3595400b WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 
am: eef477c8b9

Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1
 2016-07-20 01:28:32 +00:00
Kevin Hufnagle
55b52a2b3f Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 
am: b9487874fe

Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
 2016-07-20 01:20:20 +00:00
Paul Stewart
eef477c8b9 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e 
am: c77f18b2a3

Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
 2016-07-20 01:20:08 +00:00
Paul Stewart
a09b6ee165 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e 
am: 1e9889d5ac

Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
 2016-07-20 01:19:50 +00:00
Paul Stewart
b3ff6b4437 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 
am: f8d4c187a3

Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
 2016-07-20 01:19:46 +00:00
Kevin Hufnagle
b9487874fe Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d 
am: a812012c52

Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
 2016-07-20 01:12:40 +00:00
Paul Stewart
1e9889d5ac Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 
am: 0f9a968c0e

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454
 2016-07-20 01:12:15 +00:00
Paul Stewart
f8d4c187a3 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 
am: 6245774994

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131
 2016-07-20 01:12:11 +00:00
Paul Stewart
c77f18b2a3 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 
am: d78a14531e

Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569
 2016-07-20 01:11:49 +00:00
Kevin Hufnagle
a812012c52 Merge \\"docs: Updated descriptions of device orientation angles.\\" into mnc-docs am: d312201b74 
am: 6b4d2a2e6d

Change-Id: Idffebefeb70955553bf7539e1e225935cf57e82c
 2016-07-20 01:02:28 +00:00
Paul Stewart
d78a14531e WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee 
am: 701a6c1ed6

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857
 2016-07-20 01:01:15 +00:00
Kevin Hufnagle
6b4d2a2e6d Merge \"docs: Updated descriptions of device orientation angles.\" into mnc-docs 
am: d312201b74

Change-Id: Idfe0c0ec38bd33d64f5b8be602d24aec778fac09
 2016-07-20 00:56:28 +00:00
Paul Stewart
0f9a968c0e Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b 
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0
 2016-07-20 00:54:33 +00:00
Paul Stewart
6245774994 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d 
am: 5d60d2f772

Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7
 2016-07-20 00:54:27 +00:00
Paul Stewart
701a6c1ed6 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 
am: e41e0064ee

Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20
 2016-07-20 00:54:20 +00:00
Kevin Hufnagle
d312201b74 Merge "docs: Updated descriptions of device orientation angles." into mnc-docs 2016-07-20 00:45:09 +00:00
Paul Stewart
bb7439d8a1 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 
am: c92e93c47b

Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168
 2016-07-20 00:45:09 +00:00
Paul Stewart
5d60d2f772 Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b 
am: 700c72d01d

Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916
 2016-07-20 00:45:07 +00:00
Paul Stewart
e41e0064ee WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 
am: e2a03026c4

Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005
 2016-07-20 00:45:04 +00:00
Paul Stewart
c92e93c47b Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 
am: 2e85e2ef26

Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3
 2016-07-20 00:37:53 +00:00
Paul Stewart
700c72d01d Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 
am: bf4f010a5b

Change-Id: I7e57c484be20197748c40c80acd987802b43a734
 2016-07-20 00:37:50 +00:00
Paul Stewart
e2a03026c4 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 
am: 141477b103

Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b
 2016-07-20 00:37:44 +00:00
Paul Stewart
2e85e2ef26 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9
 2016-07-20 00:31:29 +00:00
Paul Stewart
bf4f010a5b Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf 
am: 3fbe9280a4

Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7
 2016-07-20 00:31:22 +00:00
Paul Stewart
141477b103 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 
am: df93deccf9

Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5
 2016-07-20 00:31:15 +00:00
Paul Stewart
58555ee891 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
 2016-07-20 00:25:20 +00:00
Paul Stewart
3fbe9280a4 Fix string equality comparison am: 1033c6fdbc 
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
 2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 
am: fa4bbf4ad6

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
 2016-07-20 00:25:14 +00:00
Paul Stewart
2169197e28 Merge changes Id25696e4,I939a12a2 into klp-dev 
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
 2016-07-20 00:17:49 +00:00
Paul Stewart
fdd4fe53cf Fix string equality comparison 
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
 2016-07-20 00:17:47 +00:00
Paul Stewart
fa4bbf4ad6 WifiEnterpriseConfiguration: Do not print credentials in toString 
am: cc00f4d646

Change-Id: Iece2fd19363a3524746b01cf388566363d678431
 2016-07-20 00:17:43 +00:00
Paul Stewart
77b5526229 Merge changes Id25696e4,I939a12a2 into klp-dev 
* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
 2016-07-19 23:59:00 +00:00
Sreevani Sreejith
86e39225a9 Merge "docs: Added two new logos to Auto index page. Merge commit 'b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d" into nyc-dev 2016-07-19 21:13:02 +00:00
sreevanis
7f8391a66f docs: Added two new logos to Auto index page. 
Merge commit 'b94941d03ee77ed6c0e842683ec8bf5d420298d7' into manual_merge_b94941d

Bug:29625414
Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d
 2016-07-19 13:32:30 -07:00
Jason Monk
8933c41b35 Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev 2016-07-19 20:31:23 +00:00
Jason Monk
f84c05c360 Merge "Pre-setup restrictions" into nyc-dev 2016-07-19 20:31:19 +00:00