Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hemal Patel
d0cff7a3af Docs: Added info about vector drawable am: 47876e79de 
am: f1f89fa935

Change-Id: Iadc8240aab4fce954fd0813f6817d6313ed094e7
 2016-09-30 19:07:00 +00:00
Joe Fernandez
f2461b7e67 Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83 
am: d99744e99e

Change-Id: I4e558e9c1b9411dccacf39be75ac525d1ee4a9c7
 2016-09-30 19:04:46 +00:00
Hemal Patel
da400e9dd4 Docs: Added info about vector drawable am: 47876e79de 
am: bfa9663e97

Change-Id: I5649e6f9f0e6254d43e7229ef3e88b40351b14e5
 2016-09-30 19:03:53 +00:00
Jordan Liu
456edab6e5 Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446 am: 4fe680f920 
am: 0af8ddf661

Change-Id: I24c1eea9828a2f1c4e6008e7a79f7440b9df0b0b
 2016-09-30 19:01:38 +00:00
Joe Fernandez
7e1b38cf6c Merge "Docs: Added info about vector drawable" into nyc-dev 
am: a86fbb9c83

Change-Id: Iac75c25163fa52cffe5de459ff6082b1f4b6a737
 2016-09-30 19:00:15 +00:00
Hemal Patel
f1f89fa935 Docs: Added info about vector drawable 
am: 47876e79de

Change-Id: I9fcc130c50302885397e80411858ed2ca4994db5
 2016-09-30 19:00:12 +00:00
Joe Fernandez
d99744e99e Merge "Docs: Added info about vector drawable" into nyc-dev 
am: a86fbb9c83

Change-Id: I8e3961855d46a2628dc4a8848b6e01caadd3a008
 2016-09-30 18:59:14 +00:00
Hemal Patel
bfa9663e97 Docs: Added info about vector drawable 
am: 47876e79de

Change-Id: I73d39d61210064e9de4ec212fac51a43e7a791ae
 2016-09-30 18:59:09 +00:00
Bill Yi
67a94b83de Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e -s ours am: 69f203705b -s ours 
am: 4a61fdc057  -s ours

Change-Id: Ib859d0cbecd4e3774fd2762b90c813bb6bf9bc6c
 2016-09-30 18:57:32 +00:00
Jordan Liu
0af8ddf661 Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446 
am: 4fe680f920

Change-Id: I180db3ee55eb43d66e3eef89b3e6c1c57fc25cf2
 2016-09-30 18:57:24 +00:00
Bill Yi
d748c97e7e Import translations. DO NOT MERGE am: 780931dd46 -s ours am: 5c7aa32ff3 -s ours 
am: 84f86ec99c  -s ours

Change-Id: I6537b902cc1ba74ad111039f62940255546342d2
 2016-09-30 18:56:22 +00:00
Bill Yi
4a61fdc057 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: d65fc69f4e -s ours 
am: 69f203705b  -s ours

Change-Id: I86fa51dc1b351c0ba80d5b7401deb47484a7670d
 2016-09-30 18:51:28 +00:00
Joe Fernandez
a86fbb9c83 Merge "Docs: Added info about vector drawable" into nyc-dev 2016-09-30 18:51:20 +00:00
Jordan Liu
4fe680f920 Merge "Add config_carrier_wfc_ims_available to config.xml" 
am: d1d682e446

Change-Id: I78e496cd8d01f283cfb9a737b155b0dab4984b67
 2016-09-30 18:50:24 +00:00
Bill Yi
84f86ec99c Import translations. DO NOT MERGE am: 780931dd46 -s ours 
am: 5c7aa32ff3  -s ours

Change-Id: I29e8d24f07ef09031d39180661060cd2915c5848
 2016-09-30 18:50:19 +00:00
Bill Yi
69f203705b Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 
am: d65fc69f4e  -s ours

Change-Id: I2857f19f1a47419aaf133b4c771d9da7d905357b
 2016-09-30 18:45:24 +00:00
Bill Yi
5c7aa32ff3 Import translations. DO NOT MERGE 
am: 780931dd46  -s ours

Change-Id: I704c75e6c47dfbca42026953ff92de50612cec1e
 2016-09-30 18:45:21 +00:00
Jason Monk
f099bf3b98 Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev am: 1b7e4b445f 
am: e21c1d3f44

Change-Id: Ia12f9d85c4dfe9b11c7eea646695eacf4365bd49
 2016-09-30 18:43:35 +00:00
Jordan Liu
d1d682e446 Merge "Add config_carrier_wfc_ims_available to config.xml" 2016-09-30 18:42:45 +00:00
Jason Monk
0163bc2b99 QS: Fix RTL handling for listening am: 69dac2b45b 
am: e4e5e1a273

Change-Id: Ic60b639cd0aece21f049f09bffc25915e5d2104c
 2016-09-30 18:42:27 +00:00
TreeHugger Robot
d65fc69f4e Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-30 18:39:08 +00:00
Jason Monk
e21c1d3f44 Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev 
am: 1b7e4b445f

Change-Id: I5956aa83c43d4286c6708af32ecda4800f802b02
 2016-09-30 18:36:53 +00:00
Jason Monk
e4e5e1a273 QS: Fix RTL handling for listening 
am: 69dac2b45b

Change-Id: Iab2f049d4a116fc57326df732a29c7d004f3216b
 2016-09-30 18:36:50 +00:00
Jason Monk
1b7e4b445f Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev 2016-09-30 18:32:54 +00:00
Etan Cohen
720d175757 [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast 
Broadcast can be registered protected (as in this CL) in which case they
are restricted to system apps. Broadcasts sent by the System Service must
be protected (so no one else can fake them).

The WIFI_NAN_STATE_CHANGED is sent by the System Service and no other apps
should be able to send them (e.g. to deny access to NAN to other apps).

(cherry-pick of commit b8ce87175e)

Bug: 31811154
Test: build & run - enable/disable Wi-Fi to trigger bug
Change-Id: I77ea18291d68c38a63d64a75affc6b7ea114e549
 2016-09-30 11:32:18 -07:00
Etan Cohen
4c22e8bede [NAN] Update API javadoc to clarify NAN status change broadcast scope 
(cherry-pick of commit 1fceaf9d63)

Bug: 31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
 2016-09-30 11:31:47 -07:00
Eric Schmidt
b6b5ed5bf8 Merge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63" into nyc-mr1-dev am: d0e0aea316 
am: 2e893e9834

Change-Id: Iecef09575c38901253c0f3231460de245c11e532
 2016-09-30 18:14:35 +00:00
Eric Schmidt
7d2b16ef9d Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63 am: 3ed4461219 
am: 2e8f17ad11

Change-Id: I0c295bc0ba05732a34fea36410b067c9084b6fde
 2016-09-30 18:13:30 +00:00
Eric Schmidt
d53fcb0fe1 Merge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617" into nyc-mr1-dev am: 9b65b829cd 
am: ea10cc4c1a

Change-Id: I0312cd54c8f326318f61c7199ac4302cf44681be
 2016-09-30 18:12:30 +00:00
Eric Schmidt
2651fa9d85 docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617 am: 5094fc6912 
am: 76f9b49d22

Change-Id: Icbab415e44343930b5e58c65d838093301e81379
 2016-09-30 18:11:24 +00:00
Bill Yi
f9187127f2 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: decbebd3d5 -s ours 
am: 75f0aab3b5  -s ours

Change-Id: If89c317301189e8a92a058b98526a7278e2a7844
 2016-09-30 18:10:19 +00:00
Bill Yi
5679cf97b7 Import translations. DO NOT MERGE am: b773807759 -s ours 
am: 3e41e1f7f0  -s ours

Change-Id: Ic1c2702edc71dc239702a5a4e10b568d4d608c33
 2016-09-30 18:04:58 +00:00
Sreevani Sreejith
4057537be4 Merge "docs: Updated wording on auto playback app requirement." into nyc-dev am: f8c8a636d2 am: 4df99e77af am: 8102f26b51 
am: c754436fcc

Change-Id: Id6c6b7acd253aee0f01737c3eb79a1434eb5b049
 2016-09-30 18:04:01 +00:00
Cheryl Potter
27d595a5e4 docs: help button redirects, see go/AS-help-buttons 
b/31810305

Change-Id: I9574ab873df6bec23910ae19f0a3b88afc60318e
 2016-09-30 11:01:55 -07:00
Eric Schmidt
2e893e9834 Merge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63" into nyc-mr1-dev 
am: d0e0aea316

Change-Id: I9365be99eb87c3e4559a012d719dbe3d498cafaa
 2016-09-30 18:01:32 +00:00
Eric Schmidt
2e8f17ad11 Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63 
am: 3ed4461219

Change-Id: I4dcb4b3bd251d69e8753303214d42af3a7bd5142
 2016-09-30 18:01:29 +00:00
sreevanis
a025bee0cc docs: Updated wording on auto playback app requirement. am: d4fa870a6a am: 072d47bf61 am: 2bffdff716 
am: c7ad77a05a

Change-Id: I958c97b57750a068f15a28012b3c6e51e21b15df
 2016-09-30 18:00:53 +00:00
Eric Schmidt
ea10cc4c1a Merge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617" into nyc-mr1-dev 
am: 9b65b829cd

Change-Id: If9570320cdc73b794256bed950eac1202ee5c95c
 2016-09-30 18:00:07 +00:00
Eric Schmidt
76f9b49d22 docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617 
am: 5094fc6912

Change-Id: I9f03b0ddb92cb1808095ad8ba196fdd60b1e9faf
 2016-09-30 18:00:00 +00:00
Bill Yi
75f0aab3b5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: decbebd3d5  -s ours

Change-Id: I135138575553b990bbb4299536d363e0cf57f318
 2016-09-30 17:58:36 +00:00
Bill Yi
3e41e1f7f0 Import translations. DO NOT MERGE 
am: b773807759  -s ours

Change-Id: I9512c841d39e91e0512db9abf72e78e164eafce2
 2016-09-30 17:58:33 +00:00
Sreevani Sreejith
c754436fcc Merge "docs: Updated wording on auto playback app requirement." into nyc-dev am: f8c8a636d2 am: 4df99e77af 
am: 8102f26b51

Change-Id: I26a904e87769e2d52e8336da323ef897359e51c0
 2016-09-30 17:57:40 +00:00
Randy Pan
63fc17c0b1 Merge "Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3" into nyc-dev-plus-aosp 
am: 6cfbdf11dd

Change-Id: I9211db6362922efdf6effd15290815ea0594caee
 2016-09-30 17:56:04 +00:00
sreevanis
c7ad77a05a docs: Updated wording on auto playback app requirement. am: d4fa870a6a am: 072d47bf61 
am: 2bffdff716

Change-Id: I670b76826e7b0bae90f510c9722da28d3bacdfa2
 2016-09-30 17:54:17 +00:00
Randy Pan
8f41a28f21 Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3 
am: 3629b4eddf

Change-Id: I2b148d84b278c92f2a1f0b12f9ca2ff231b4602c
 2016-09-30 17:52:39 +00:00
Eric Schmidt
ccb5f84092 Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d 
am: c6b19af30d

Change-Id: I0983dce1f486a4bd3cd65d80aab5e4cf7d709563
 2016-09-30 17:50:17 +00:00
Android Build Merger (Role)
d0e0aea316 Merge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63" into nyc-mr1-dev 2016-09-30 17:49:48 +00:00
Eric Schmidt
adb37ddbcc docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 
am: 62ec0a6b85

Change-Id: I5a23427e2c52cbbcae83601ab9f2236ad6e723de
 2016-09-30 17:49:20 +00:00
Eric Schmidt
3ed4461219 Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d 
am: 76ae4deb63

Change-Id: Ia2d18912b3125363ea6eee3a770970978c2084dc
 2016-09-30 17:49:09 +00:00
Android Build Merger (Role)
9b65b829cd Merge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617" into nyc-mr1-dev 2016-09-30 17:48:55 +00:00