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

161105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
dbec5ae69a am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:35:45 +00:00
Andrew Solovay
78bbfe049c Merge "docs: Removed sentence fragments." into lmp-docs 2015-03-18 22:27:08 +00:00
xinhe
9954faa70d Change rtt Framework interface 
Bug:19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
 2015-03-18 22:26:48 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 2015-03-18 22:23:13 +00:00
Bart Sears
dd985c21dd am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 
* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.
 2015-03-18 20:30:15 +00:00
Bart Sears
c2eb5c602d Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 2015-03-18 20:22:36 +00:00
Tyler Gunn
d11a31561e resolve merge conflicts of bcb17eb to m-wireless-dev. 
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
 2015-03-18 13:09:14 -07:00
Brian Carlstrom
f9296808e9 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
automerge: 6a6cf63

* commit '6a6cf634f527cdde9382e8fabb4de5aaad748879':
  Update vmSafeMode documentation
 2015-03-18 19:08:26 +00:00
Pavel Zhamaitsiak
c24a5ad099 Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev 
automerge: 1d33a37

* commit '1d33a37e0591b27386db2d324313e601cef42527':
  Add format string for displaying SPN in Wi-Fi calling mode.
 2015-03-18 19:08:18 +00:00
Deepanshu Gupta
8c4e96f62e am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
automerge: 579535a

* commit '579535acfa1c5c093b5152cf6f20603b273137be':
  Fix AppCompat action bar theming.
 2015-03-18 19:08:09 +00:00
Deepanshu Gupta
7cbbc70d93 am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
automerge: cc5c1a5

* commit 'cc5c1a57b05b2cda45936172bbe91a52ae9adee6':
  Fix NoActionBar themes rendering.
 2015-03-18 19:08:01 +00:00
Luan Nguyen
25811656cf am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
automerge: 7962ae3

* commit '7962ae36eb8be221753f2b3c75bdb676beda938c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-18 19:07:53 +00:00
Craig Mautner
7b07f87440 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
automerge: c5ee610

* commit 'c5ee610da5e3732e38e7e15d684c455eb6131279':
  Correct docs to specify leading slash in paths.
 2015-03-18 19:07:44 +00:00
Nathan Harold
5fc29ed61a Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev 
automerge: 8ee14a2

* commit '8ee14a244851ac80af0193541a5d521462d75e1e':
  Adding hidden isWifiCallingEnabled() and isVolteEnabled()
 2015-03-18 19:07:35 +00:00
Andrew Solovay
43100d3203 docs: Removed sentence fragments. 
These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175
 2015-03-18 11:56:20 -07:00
Vinit Deshpande
349868c105 Merge "Fix scan results to hold passpoint data" into m-wireless-dev 2015-03-18 18:43:35 +00:00
Dan Sandler
1ac28e18b4 am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.
 2015-03-18 18:28:31 +00:00
Dan Sandler
b3a1b6632e Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 2015-03-18 18:23:20 +00:00
Rich Slogar
455b64c57f am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '8d3f587f15016d193e4739e3893b77e11336b498':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:35:02 +00:00
Rich Slogar
8d3f587f15 am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:27:29 +00:00
Rich Slogar
57c24fbb90 am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:20:51 +00:00
Rich Slogar
2fc33a008c am ddc44153: docs: downloads for sdk 24.1.2 
* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:13:55 +00:00
Paul Jensen
43564472ee Remove dead code, mostly DataStateTracker. 
(cherry picked from AOSP commit 7fad4eb4b52bc6c7ddad47f70e0c310093fbde3b)

Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058
 2015-03-18 12:29:13 -04:00
Paul Jensen
76b610a9a1 Make NetworkCapabilities.NOT_VPN javadoc visible. 
Also adjust wording to be more suitable for NetworkRequests and NetworkAgents.

Change-Id: I1cc93cb20779cf02d6ffa0fa11ad2916c199b365
 2015-03-18 09:33:07 -04:00
Rich Slogar
ddc4415329 docs: downloads for sdk 24.1.2 
b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
 2015-03-17 17:20:09 -07:00
Erik Kline
d92bd99f65 Merge "Fix missing printf argument." into m-wireless-dev 2015-03-18 00:18:41 +00:00
Deepanshu Gupta
84e550f5e6 Fix layoutlib tests. 
The date picker and calendar widgets show the current date. Comparing
widgets showing current date with a static golden image wasn't the best
idea.

- Change the widgets to custom widgets that set a predefined date/time
  so that the rendering is independent of the system date.
- Change the layout slightly to make it look nicer.
- Update gradle plugin version.

Change-Id: Ia3fb4965a372a28087a0d8c9df40fd6779df6050
 2015-03-17 17:17:42 -07:00
Vinit Deshpande
2522c830a3 Fix scan results to hold passpoint data 
Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
 2015-03-17 17:11:06 -07:00
Vinit Deshpande
9bd938a671 Merge "Improve passpoint configuration validation" into m-wireless-dev 2015-03-18 00:06:49 +00:00
Erik Kline
f5bd6a9719 Fix missing printf argument. 
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
 2015-03-18 08:41:42 +09:00
Pierre Vandwalle
7c39808331 Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev 2015-03-17 22:29:36 +00:00
Dong Zhou
bcb17eb7a9 am 89f41eb3: Define the capability to speed up MT call audio 
* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio
 2015-03-17 22:21:21 +00:00
Dong Zhou
89f41eb39e Define the capability to speed up MT call audio 
Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
 2015-03-17 22:16:52 +00:00
Wei Wang
4190762d94 Add opportunistic ble scan mode. (1/2) 
Bug: 19003667
Change-Id: Ibed7e9ec604cb11a58736d168d3d19ece53fc77a
(cherry picked from commit 7508ddf8b53bf350a3424ef71f1ce62ea17006b8)
 2015-03-17 22:04:01 +00:00
Brian Carlstrom
6a6cf634f5 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation
 2015-03-17 19:29:38 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
Pavel Zhamaitsiak
1d33a37e05 Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev 2015-03-17 18:28:35 +00:00
Dan Sandler
06433bd9f3 Avoid crashing on corrupted notifications. 
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
 2015-03-17 16:34:34 +00:00
Deepanshu Gupta
579535acfa am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '1f9a26af95abba385b612c734d1d5e32d9e3f363':
  Fix AppCompat action bar theming.
 2015-03-17 14:28:36 +00:00
Deepanshu Gupta
cc5c1a57b0 am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
  Fix NoActionBar themes rendering.
 2015-03-17 14:28:32 +00:00
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
 2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
 2015-03-17 14:16:42 +00:00
Lorenzo Colitti
3698af5f64 DHCP: Don't write options longer than 255 bytes. 
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
 2015-03-17 19:56:34 +09:00
Lorenzo Colitti
2ed489f410 DHCP: parsing robustness fixes. 
1. Check the length of the fixed-length portions of the packet.
2. Catch BufferUnderflowException while parsing options.

Change-Id: If907f49f02a04a4a3360f46a3192e94ab099af0e
 2015-03-17 19:46:14 +09:00
Lorenzo Colitti
cac9a63cf1 DHCP: Add a hidden setting to use the legacy DHCP client. 
Change-Id: I5505bd2c20ddc895df0e9b176e1ed770ad74a3f4
 2015-03-17 19:46:13 +09:00
Lorenzo Colitti
a071edce46 DHCP: Add a Java DHCP client. 
The behaviour of the client is intended to mirror the behaviour
of the current DhcpStateMachine + dhcpcd combination, except it
does not store leases across network changes.

Bug: 19704592
Change-Id: I110b58003da2d8293059d48a0181e16f7f7f145c
 2015-03-17 19:46:13 +09:00
Lorenzo Colitti
4ff9f0fd9f Add a protectFromVpn method that takes a FileDescriptor 
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
 2015-03-17 19:46:12 +09:00
Lorenzo Colitti
04b8d3aab6 DHCP: protocol changes. 
1. Define and add parsing code for MTU, max message size, T1, T2.
2. Add common TLVs (message size, hostname, vendor ID) to all
   packets sent by the client.
3. Don't include requested IP and server ID in renew messages,
   since the RFC says MUST NOT.
4. Don't hardcode the broadcast flag to true in DISCOVER packets,
   use what the caller passed in.
5. Make some methods static.

Bug: 19704592
Change-Id: I42a0997e468b12e19cad9b403b98fe266e6cea73
 2015-03-17 13:21:21 +09:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming. 
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
 2015-03-17 00:21:02 +00:00